add:展台
This commit is contained in:
@@ -70,7 +70,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
LogHelper.WriteLogToFile($"ProcessProtectionManager.WithWriteAccess: 获取写入门闩超时({gateTimeoutMs}ms),将降级直接执行写入动作。目标: {targetPath}",
|
LogHelper.WriteLogToFile($"ProcessProtectionManager.WithWriteAccess: 获取写入门闩超时({gateTimeoutMs}ms),将降级直接执行写入动作。目标: {targetPath}",
|
||||||
LogHelper.LogType.Warn);
|
LogHelper.LogType.Warning);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10552,15 +10552,15 @@
|
|||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<!-- 底部按钮区域 -->
|
<!-- 底部按钮区域 -->
|
||||||
<Grid Grid.Row="4" Height="60">
|
<Grid Grid.Row="4" Height="Auto" Margin="0,0,0,6">
|
||||||
<StackPanel
|
<WrapPanel
|
||||||
Margin="10,5"
|
Margin="10,5"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal"
|
||||||
|
ItemHeight="40">
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="BtnToggleVideoPresenterLiveOnCanvas"
|
x:Name="BtnToggleVideoPresenterLiveOnCanvas"
|
||||||
Width="90"
|
|
||||||
Height="40"
|
Height="40"
|
||||||
Margin="3,0"
|
Margin="3,0"
|
||||||
Background="{DynamicResource FloatBarBackground}"
|
Background="{DynamicResource FloatBarBackground}"
|
||||||
@@ -10576,7 +10576,6 @@
|
|||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="CheckBoxEnablePhotoCorrection"
|
x:Name="CheckBoxEnablePhotoCorrection"
|
||||||
Width="110"
|
|
||||||
Height="40"
|
Height="40"
|
||||||
Margin="3,0"
|
Margin="3,0"
|
||||||
Background="{DynamicResource FloatBarBackground}"
|
Background="{DynamicResource FloatBarBackground}"
|
||||||
@@ -10588,11 +10587,10 @@
|
|||||||
FontSize="12"
|
FontSize="12"
|
||||||
FontWeight="SemiBold"
|
FontWeight="SemiBold"
|
||||||
Foreground="{DynamicResource FloatBarForeground}"
|
Foreground="{DynamicResource FloatBarForeground}"
|
||||||
Text="实时矫正" />
|
Text="矫正" />
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
<Button
|
<Button
|
||||||
x:Name="BtnCapturePhoto"
|
x:Name="BtnCapturePhoto"
|
||||||
Width="90"
|
|
||||||
Height="40"
|
Height="40"
|
||||||
Margin="3,0"
|
Margin="3,0"
|
||||||
Background="{DynamicResource FloatBarBackground}"
|
Background="{DynamicResource FloatBarBackground}"
|
||||||
@@ -10607,7 +10605,6 @@
|
|||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
x:Name="BtnRotateImage"
|
x:Name="BtnRotateImage"
|
||||||
Width="90"
|
|
||||||
Height="40"
|
Height="40"
|
||||||
Margin="3,0"
|
Margin="3,0"
|
||||||
Background="{DynamicResource FloatBarBackground}"
|
Background="{DynamicResource FloatBarBackground}"
|
||||||
@@ -10620,7 +10617,7 @@
|
|||||||
Foreground="{DynamicResource FloatBarForeground}"
|
Foreground="{DynamicResource FloatBarForeground}"
|
||||||
Text="旋转" />
|
Text="旋转" />
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</WrapPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -183,6 +183,15 @@ namespace Ink_Canvas
|
|||||||
Visibility = Visibility.Visible,
|
Visibility = Visibility.Visible,
|
||||||
Opacity = 1.0
|
Opacity = 1.0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 让它具备与“普通插入图片”一致的选中/拖拽/缩放行为
|
||||||
|
try
|
||||||
|
{
|
||||||
|
InitializeElementTransform(img);
|
||||||
|
BindElementEvents(img);
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
|
||||||
_liveFrameImageByPage[page] = img;
|
_liveFrameImageByPage[page] = img;
|
||||||
return img;
|
return img;
|
||||||
}
|
}
|
||||||
@@ -290,6 +299,15 @@ namespace Ink_Canvas
|
|||||||
inkCanvas.Children.Add(img);
|
inkCanvas.Children.Add(img);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 上屏后自动切到选择模式,否则用户在笔模式下点不中元素
|
||||||
|
try
|
||||||
|
{
|
||||||
|
SetCurrentToolMode(InkCanvasEditingMode.Select);
|
||||||
|
UpdateCurrentToolMode("select");
|
||||||
|
HideSubPanels("select");
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
|
||||||
// 立即用侧栏预览刷新一次
|
// 立即用侧栏预览刷新一次
|
||||||
if (VideoPresenterPreviewImage?.Source is BitmapImage bi)
|
if (VideoPresenterPreviewImage?.Source is BitmapImage bi)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user