From 1a585d353fda861c7497a5d2f9cf4c3febb517c1 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 19 Feb 2026 18:34:30 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=B1=95=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Helpers/ProcessProtectionManager.cs |  2 +-
 Ink Canvas/MainWindow.xaml                     | 15 ++++++---------
 Ink Canvas/MainWindow_cs/MW_VideoPresenter.cs  | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 10 deletions(-)

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