From 43314a30060f54dadaa91d3c551e11571c77f01d Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Wed, 27 Jul 2022 17:13:45 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=95=E6=88=AA=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Windows/PixelColorPickerWindow.xaml.cs    | 13 +++++++---
 Plugins/ShowSeconds/SecondsWindow.xaml.cs     | 25 ++++---------------
 Util/ScreenUtil.cs                            | 25 +++++++++++++++++++
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/Control/Windows/PixelColorPickerWindow.xaml.cs b/Control/Windows/PixelColorPickerWindow.xaml.cs
index 06f151f..a1917aa 100644
--- a/Control/Windows/PixelColorPickerWindow.xaml.cs
+++ b/Control/Windows/PixelColorPickerWindow.xaml.cs
@@ -39,7 +39,11 @@ namespace GeekDesk.Control.Windows
         {
             InitializeComponent();
             this.colorPicker = colorPicker;
-            SetProcessDPIAware();
+            try
+            {
+                SetProcessDPIAware();
+            }
+            catch (Exception e) { }
             ColorPickerWindow_Init();
         }
 
@@ -58,9 +62,12 @@ namespace GeekDesk.Control.Windows
             DesktopBG.Height = this.Height;
             this.Topmost = true;
 
+            //获取缩放比例
+            double scale = ScreenUtil.GetScreenScalingFactor();
+
             bgBitmap = new System.Drawing.Bitmap(
-                    Screen.AllScreens[0].Bounds.Width,
-                    Screen.AllScreens[0].Bounds.Height,
+                    (int)(Width * scale),
+                    (int)(Height * scale),
                     System.Drawing.Imaging.PixelFormat.Format32bppArgb
                 );
 
diff --git a/Plugins/ShowSeconds/SecondsWindow.xaml.cs b/Plugins/ShowSeconds/SecondsWindow.xaml.cs
index e721976..47047d3 100644
--- a/Plugins/ShowSeconds/SecondsWindow.xaml.cs
+++ b/Plugins/ShowSeconds/SecondsWindow.xaml.cs
@@ -154,7 +154,7 @@ namespace ShowSeconds
 
                     //获取实际坐标  windows可能会有缩放
                     IntPtr hdc = GetDC(IntPtr.Zero);
-                    double scale = GetScreenScalingFactor();
+                    double scale = ScreenUtil.GetScreenScalingFactor();
                     
                     x = (int)(x / scale);
                     y = (int)(y / scale);
@@ -268,7 +268,7 @@ namespace ShowSeconds
             double h = 1080;
             double width = SystemParameters.PrimaryScreenWidth;
             double height = SystemParameters.PrimaryScreenHeight;
-            double scale = GetScreenScalingFactor();
+            double scale = ScreenUtil.GetScreenScalingFactor();
 
             Console.WriteLine("bef:" + w2 / w * width);
             Console.WriteLine("af:" + w2 / w * width * scale);
@@ -347,23 +347,9 @@ namespace ShowSeconds
 
 
         //#######################################################
-        public const int HORZRES = 8;
-        public const int VERTRES = 10;
-        public const int DESKTOPVERTRES = 117;
-        public const int DESKTOPHORZRES = 118;
+     
 
-        private static double GetScreenScalingFactor()
-        {
-            var g = Graphics.FromHwnd(IntPtr.Zero);
-            IntPtr desktop = g.GetHdc();
-            var physicalScreenHeight = GetDeviceCaps(desktop, (int)DESKTOPVERTRES);
-
-            var screenScalingFactor =
-                (double)physicalScreenHeight / SystemParameters.PrimaryScreenHeight;
-            //SystemParameters.PrimaryScreenHeight;
-
-            return screenScalingFactor;
-        }
+        
 
 
         /// <summary>
@@ -385,7 +371,6 @@ namespace ShowSeconds
         public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
         [DllImport("user32")]
         public static extern bool GetCursorPos(out System.Drawing.Point pt);
-        [DllImport("gdi32")]
-        static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
     }
 }
diff --git a/Util/ScreenUtil.cs b/Util/ScreenUtil.cs
index e35ce04..19c6c44 100644
--- a/Util/ScreenUtil.cs
+++ b/Util/ScreenUtil.cs
@@ -120,5 +120,30 @@ namespace GeekDesk.Util
             return screenPixel.GetPixel(0, 0);
         }
 
+
+        [DllImport("gdi32")]
+        static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+        public const int HORZRES = 8;
+        public const int VERTRES = 10;
+        public const int DESKTOPVERTRES = 117;
+        public const int DESKTOPHORZRES = 118;
+        /// <summary>
+        /// 获取屏幕缩放比例
+        /// </summary>
+        /// <returns></returns>
+        public static double GetScreenScalingFactor()
+        {
+            var g = Graphics.FromHwnd(IntPtr.Zero);
+            IntPtr desktop = g.GetHdc();
+            var physicalScreenHeight = GetDeviceCaps(desktop, (int)DESKTOPVERTRES);
+
+            var screenScalingFactor =
+                (double)physicalScreenHeight / SystemParameters.PrimaryScreenHeight;
+            //SystemParameters.PrimaryScreenHeight;
+
+            return screenScalingFactor;
+        }
+
     }
 }