From fab9e4b265fa4ae9df693959c27aff57d5b13315 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 13 Sep 2025 13:37:51 +0800
Subject: [PATCH] =?UTF-8?q?improve:=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_ImageInsert.cs    |  40 +++++++++++++++++
 .../Windows/ScreenshotSelectorWindow.xaml     |   9 ++++
 .../Windows/ScreenshotSelectorWindow.xaml.cs  |  41 ++++++++++++++++++
 ...vasForClass.csproj.AssemblyReference.cache | Bin 35689 -> 35826 bytes
 4 files changed, 90 insertions(+)

diff --git a/Ink Canvas/MainWindow_cs/MW_ImageInsert.cs b/Ink Canvas/MainWindow_cs/MW_ImageInsert.cs
index 6c77b485..82193558 100644
--- a/Ink Canvas/MainWindow_cs/MW_ImageInsert.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ImageInsert.cs	
@@ -100,6 +100,46 @@ namespace Ink_Canvas
             }
         }
 
+        // 直接全屏截图并插入到画布
+        private async Task CaptureFullScreenAndInsert()
+        {
+            try
+            {
+                // 隐藏主窗口以避免截图包含窗口本身
+                var originalVisibility = Visibility;
+                Visibility = Visibility.Hidden;
+
+                // 等待窗口隐藏
+                await Task.Delay(200);
+
+                // 获取虚拟屏幕边界
+                var virtualScreen = SystemInformation.VirtualScreen;
+                var fullScreenArea = new Rectangle(virtualScreen.X, virtualScreen.Y, virtualScreen.Width, virtualScreen.Height);
+
+                // 截取全屏
+                using (var fullScreenBitmap = CaptureScreenArea(fullScreenArea))
+                {
+                    if (fullScreenBitmap != null)
+                    {
+                        // 将截图转换为WPF Image并插入到画布
+                        await InsertScreenshotToCanvas(fullScreenBitmap);
+                    }
+                    else
+                    {
+                        ShowNotification("全屏截图失败");
+                    }
+                }
+
+                // 恢复窗口显示
+                Visibility = originalVisibility;
+            }
+            catch (Exception ex)
+            {
+                ShowNotification($"全屏截图失败: {ex.Message}");
+                Visibility = Visibility.Visible;
+            }
+        }
+
         // 显示截图区域选择器
         private async Task<ScreenshotResult?> ShowScreenshotSelector()
         {
diff --git a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml
index ef299119..05739cce 100644
--- a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml	
+++ b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml	
@@ -117,6 +117,15 @@
                         BorderThickness="0"
                         FontWeight="Medium"
                         Click="FreehandModeButton_Click" />
+                <Button Name="FullScreenButton" 
+                        Content="全屏截图" 
+                        Margin="4,0"
+                        Padding="12,6"
+                        Background="#7c3aed"
+                        Foreground="White"
+                        BorderThickness="0"
+                        FontWeight="Medium"
+                        Click="FullScreenButton_Click" />
                 
                 <!-- 分隔线 -->
                 <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" 
diff --git a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs
index 85ee727a..1c2a0de3 100644
--- a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs	
+++ b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs	
@@ -146,6 +146,7 @@ namespace Ink_Canvas
             _isFreehandMode = false;
             RectangleModeButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235)); // 蓝色
             FreehandModeButton.Background = new SolidColorBrush(Color.FromRgb(107, 114, 128)); // 灰色
+            FullScreenButton.Background = new SolidColorBrush(Color.FromRgb(107, 114, 128)); // 灰色
             HintText.Text = "拖拽鼠标选择矩形区域";
             HintText.Visibility = Visibility.Visible;
         }
@@ -158,10 +159,26 @@ namespace Ink_Canvas
             _isFreehandMode = true;
             FreehandModeButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235)); // 蓝色
             RectangleModeButton.Background = new SolidColorBrush(Color.FromRgb(107, 114, 128)); // 灰色
+            FullScreenButton.Background = new SolidColorBrush(Color.FromRgb(107, 114, 128)); // 灰色
             HintText.Text = "按住鼠标左键绘制任意形状，松开直接截图";
             HintText.Visibility = Visibility.Visible;
         }
 
+        private void FullScreenButton_Click(object sender, RoutedEventArgs e)
+        {
+            // 重置所有选择状态
+            ResetSelectionState();
+
+            // 设置全屏截图模式
+            _isFreehandMode = false;
+            FullScreenButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235)); // 蓝色
+            RectangleModeButton.Background = new SolidColorBrush(Color.FromRgb(107, 114, 128)); // 灰色
+            FreehandModeButton.Background = new SolidColorBrush(Color.FromRgb(107, 114, 128)); // 灰色
+            
+            // 直接执行全屏截图
+            PerformFullScreenCapture();
+        }
+
         private void ConfirmButton_Click(object sender, RoutedEventArgs e)
         {
             // 在自由绘制模式下，确认按钮不执行任何操作
@@ -786,6 +803,30 @@ namespace Ink_Canvas
             }
         }
 
+        private void PerformFullScreenCapture()
+        {
+            try
+            {
+                // 获取虚拟屏幕边界
+                var virtualScreen = SystemInformation.VirtualScreen;
+                
+                // 设置全屏截图区域
+                SelectedArea = new DrawingRectangle(virtualScreen.X, virtualScreen.Y, virtualScreen.Width, virtualScreen.Height);
+                SelectedPath = null; // 全屏截图不需要路径
+                
+                // 直接关闭窗口并返回结果
+                DialogResult = true;
+                Close();
+            }
+            catch (Exception ex)
+            {
+                // 如果全屏截图失败，记录错误并关闭窗口
+                System.Diagnostics.Debug.WriteLine($"全屏截图失败: {ex.Message}");
+                DialogResult = false;
+                Close();
+            }
+        }
+
         private void ResetSelectionState()
         {
             // 重置所有选择相关的状态
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 4f2348e4edb2658289eb7979cb81cc47e276fd63..44b9fc7383ebb573862944afd3220347eedadfaa 100644
GIT binary patch
delta 70
zcmaDkjp@^LCJr`6eFg>w#>B~nPN5rPdAcVD$b?U}m*kqv$IYhXte29L!^j9!!0^EF
X#&?CQ93Zt^WhQzCdd3FEhL#KfstysU

delta 23
ecmew~o$2K?CJr`6Jq88_#>B~nPN5rPdAb2r0|u-B