From c513ad9291f6a96a1620dee5c31a2dbca822764b Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 31 Jul 2025 10:55:01 +0800
Subject: [PATCH] =?UTF-8?q?improve:=E6=8F=92=E5=85=A5=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_Screenshot.cs | 62 +++++++++++++----------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_Screenshot.cs b/Ink Canvas/MainWindow_cs/MW_Screenshot.cs
index 4cd76d90..d33e88de 100644
--- a/Ink Canvas/MainWindow_cs/MW_Screenshot.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Screenshot.cs	
@@ -256,49 +256,48 @@ namespace Ink_Canvas {
         {
             try
             {
-                // 创建遮罩位图
-                using (var maskBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb))
-                using (var maskGraphics = Graphics.FromImage(maskBitmap))
+                // 获取DPI缩放比例
+                var dpiScale = GetDpiScale();
+                var virtualScreen = SystemInformation.VirtualScreen;
+                
+                // 创建结果位图
+                var resultBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb);
+                using (var resultGraphics = Graphics.FromImage(resultBitmap))
                 {
                     // 设置高质量渲染
-                    maskGraphics.SmoothingMode = SmoothingMode.AntiAlias;
-                    maskGraphics.CompositingQuality = CompositingQuality.HighQuality;
+                    resultGraphics.SmoothingMode = SmoothingMode.AntiAlias;
+                    resultGraphics.CompositingQuality = CompositingQuality.HighQuality;
 
                     // 创建路径
                     using (var pathGraphics = new GraphicsPath())
                     {
-                        // 转换WPF坐标到GDI+坐标
+                        // 转换WPF坐标到GDI+坐标，考虑DPI缩放和屏幕偏移
                         var points = new PointF[path.Count];
                         for (int i = 0; i < path.Count; i++)
                         {
-                            points[i] = new PointF(
-                                (float)(path[i].X - area.X),
-                                (float)(path[i].Y - area.Y)
-                            );
+                            // 将WPF坐标转换为实际屏幕坐标，然后相对于截图区域计算偏移
+                            double screenX = (path[i].X * dpiScale) + virtualScreen.Left;
+                            double screenY = (path[i].Y * dpiScale) + virtualScreen.Top;
+                            
+                            // 计算相对于截图区域的坐标
+                            float relativeX = (float)(screenX - area.X);
+                            float relativeY = (float)(screenY - area.Y);
+                            
+                            points[i] = new PointF(relativeX, relativeY);
                         }
 
                         // 添加路径
                         pathGraphics.AddPolygon(points);
 
-                        // 填充路径内部为白色（保留区域）
-                        maskGraphics.FillPath(Brushes.White, pathGraphics);
-                    }
-
-                    // 创建结果位图
-                    var resultBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb);
-                    using (var resultGraphics = Graphics.FromImage(resultBitmap))
-                    {
-                        // 设置高质量渲染
-                        resultGraphics.SmoothingMode = SmoothingMode.AntiAlias;
-                        resultGraphics.CompositingQuality = CompositingQuality.HighQuality;
-
-                        // 使用遮罩合成图像
+                        // 设置裁剪区域为路径内部
+                        resultGraphics.SetClip(pathGraphics);
+                        
+                        // 在裁剪区域内绘制原始图像
                         resultGraphics.DrawImage(bitmap, 0, 0);
-                        resultGraphics.DrawImage(maskBitmap, 0, 0);
                     }
-
-                    return resultBitmap;
                 }
+
+                return resultBitmap;
             }
             catch (Exception ex)
             {
@@ -307,6 +306,17 @@ namespace Ink_Canvas {
             }
         }
 
+        // 获取DPI缩放比例
+        private double GetDpiScale()
+        {
+            var source = PresentationSource.FromVisual(this);
+            if (source?.CompositionTarget != null)
+            {
+                return source.CompositionTarget.TransformToDevice.M11;
+            }
+            return 1.0; // 默认DPI
+        }
+
         // 将System.Drawing.Bitmap转换为WPF BitmapSource
         private BitmapSource ConvertBitmapToBitmapSource(Bitmap bitmap) {
             using (var memory = new MemoryStream()) {