Merge pull request #1832 from cwensley/curtis/wpf-more-system-dpi-fixes

Wpf: More fixes getting proper screen bounds and image when using system dpi
picoe · Nov 26, 2020 · 2b9dc7c · 2b9dc7c
2 parents c3d43f2 + 88c4493
commit 2b9dc7c
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 29 deletions.
diff --git a/src/Eto.WinForms/Win32.cs b/src/Eto.WinForms/Win32.cs
@@ -21,6 +21,7 @@ public struct RECT
 			public int height => bottom - top;
 
 			public System.Drawing.Rectangle ToSD() => new System.Drawing.Rectangle(left, top, width, height);
+			public Eto.Drawing.Rectangle ToEto() => new Eto.Drawing.Rectangle(left, top, width, height);
 		}
 
 		[StructLayout(LayoutKind.Sequential)]

diff --git a/src/Eto.WinForms/Win32.dpi.cs b/src/Eto.WinForms/Win32.dpi.cs
@@ -127,39 +127,24 @@ public override sd.Rectangle GetBounds(swf.Screen screen)
 				if (!PerMonitorDpiSupported)
 					return screen.Bounds;
 
-				var oldDpiAwareness = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2);
-
-				var hmonitor = MonitorFromPoint(screen.Bounds.Location, 0);
 				var info = new MONITORINFOEX();
-				GetMonitorInfo(new HandleRef(null, hmonitor), info);
-
-				//var bounds = screen.Bounds;
-				var bounds = info.rcMonitor.ToSD();
+				GetMonitorInfo(screen, ref info);
 
-				if (oldDpiAwareness != DPI_AWARENESS_CONTEXT.NONE)
-					SetThreadDpiAwarenessContext(oldDpiAwareness);
-				return bounds;
+				return info.rcMonitor.ToSD();
 			}
 
 			public sd.Rectangle GetWorkingArea(swf.Screen screen)
 			{
 				if (!PerMonitorDpiSupported)
 					return screen.WorkingArea;
 
-				var oldDpiAwareness = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2);
-
-				var hmonitor = MonitorFromPoint(screen.Bounds.Location, 0);
 				var info = new MONITORINFOEX();
-				GetMonitorInfo(new HandleRef(null, hmonitor), info);
-
-				// var bounds = screen.WorkingArea;
-				var bounds = info.rcWork.ToSD();
-
-				if (oldDpiAwareness != DPI_AWARENESS_CONTEXT.NONE)
-					SetThreadDpiAwarenessContext(oldDpiAwareness);
-				return bounds;
+				GetMonitorInfo(screen, ref info);
+
+				return info.rcWork.ToSD();
 			}
 
+
 			DPI_AWARENESS_CONTEXT? processDpiAwareness;
 
 			public DPI_AWARENESS_CONTEXT ProcessDpiAwareness
@@ -183,11 +168,11 @@ public override float GetLogicalPixelSize(swf.Screen screen)
 						return (uint)graphics.DpiY / 96f;
 					}
 				}
+				var mon = MonitorFromPoint(screen.Bounds.Location, MONITOR.DEFAULTTONEAREST);
+
 				// use per-monitor aware dpi awareness to get ACTUAL dpi here
 				var oldDpiAwareness = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2);
 
-				var pnt = new System.Drawing.Point(screen.Bounds.Left + 1, screen.Bounds.Top + 1);
-				var mon = MonitorFromPoint(pnt, MONITOR.DEFAULTTONEAREST);
 				uint dpiX, dpiY;
 				GetDpiForMonitor(mon, MDT.EFFECTIVE_DPI, out dpiX, out dpiY);
 
@@ -210,6 +195,19 @@ public override float GetLogicalPixelSize(swf.Screen screen)
 
 		public static float GetLogicalPixelSize(this swf.Screen screen) => locationHelper.GetLogicalPixelSize(screen);
 
+		public static void GetMonitorInfo(this swf.Screen screen, ref MONITORINFOEX info)
+		{
+			var hmonitor = MonitorFromPoint(screen.Bounds.Location, 0);
+
+			var oldDpiAwareness = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2);
+
+			GetMonitorInfo(new HandleRef(null, hmonitor), info);
+
+			if (oldDpiAwareness != DPI_AWARENESS_CONTEXT.NONE)
+				SetThreadDpiAwarenessContext(oldDpiAwareness);
+		}
+
+
 		[DllImport("User32.dll")]
 		public static extern IntPtr MonitorFromPoint(System.Drawing.Point pt, MONITOR dwFlags);
 

diff --git a/src/Eto.Wpf/Forms/MouseHandler.cs b/src/Eto.Wpf/Forms/MouseHandler.cs
@@ -18,15 +18,16 @@ public PointF Position
 			get
 			{
 				var oldDpiAwareness = Win32.PerMonitorDpiSupported ? Win32.SetThreadDpiAwarenessContext(Win32.DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2) : Win32.DPI_AWARENESS_CONTEXT.NONE;
-				var result = swf.Control.MousePosition.ScreenToLogical();
+				var result = swf.Control.MousePosition;
 				if (oldDpiAwareness != Win32.DPI_AWARENESS_CONTEXT.NONE)
 					Win32.SetThreadDpiAwarenessContext(oldDpiAwareness);
-				return result;
+				return result.ScreenToLogical();
 			}
 			set
 			{
+				var pos = value.LogicalToScreen();
 				var oldDpiAwareness = Win32.PerMonitorDpiSupported ? Win32.SetThreadDpiAwarenessContext(Win32.DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2) : Win32.DPI_AWARENESS_CONTEXT.NONE;
-				swf.Cursor.Position = Point.Round(value.LogicalToScreen()).ToSD();
+				swf.Cursor.Position = Point.Round(pos).ToSD();
 				if (oldDpiAwareness != Win32.DPI_AWARENESS_CONTEXT.NONE)
 					Win32.SetThreadDpiAwarenessContext(oldDpiAwareness);
 			}

diff --git a/src/Eto.Wpf/Forms/ScreenHandler.cs b/src/Eto.Wpf/Forms/ScreenHandler.cs
@@ -51,7 +51,13 @@ float GetRealScale()
 		public Image GetImage(RectangleF rect)
 		{
 			var adjustedRect = rect * Widget.LogicalPixelSize;
-			adjustedRect.Location += Control.Bounds.Location.ToEto();
+			//adjustedRect.Location += Control.Bounds.Location.ToEto();
+
+			var info = new Win32.MONITORINFOEX();
+			Win32.GetMonitorInfo(Control, ref info);
+			adjustedRect.Location += info.rcMonitor.ToEto().Location;
+
+			var oldDpiAwareness = Win32.PerMonitorDpiSupported ? Win32.SetThreadDpiAwarenessContext(Win32.DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2) : Win32.DPI_AWARENESS_CONTEXT.NONE;
 			var realRect = Rectangle.Ceiling(adjustedRect);
 			using (var screenBmp = new sd.Bitmap(realRect.Width, realRect.Height, sd.Imaging.PixelFormat.Format32bppRgb))
 			{
@@ -64,6 +70,9 @@ public Image GetImage(RectangleF rect)
 						sw.Int32Rect.Empty,
 						sw.Media.Imaging.BitmapSizeOptions.FromEmptyOptions());
 
+					if (oldDpiAwareness != Win32.DPI_AWARENESS_CONTEXT.NONE)
+						Win32.SetThreadDpiAwarenessContext(oldDpiAwareness);
+
 					return new Bitmap(new BitmapHandler(bitmapSource));
 				}
 			}

diff --git a/src/Eto.Wpf/Forms/WpfWindow.cs b/src/Eto.Wpf/Forms/WpfWindow.cs
@@ -594,20 +594,23 @@ System.Windows.Forms.Screen SwfScreen
 				var handle = WindowHandle;
 				if (handle != IntPtr.Zero)
 				{
+					Point? location = null;
 					// Left/Top doesn't always report correct location when maximized, so use Win32 when we can.
 					var oldDpiAwareness = Win32.PerMonitorDpiSupported ? Win32.SetThreadDpiAwarenessContext(Win32.DPI_AWARENESS_CONTEXT.PER_MONITOR_AWARE_v2) : Win32.DPI_AWARENESS_CONTEXT.NONE;
 					try
 					{
-
 						Win32.RECT rect;
 						if (Win32.GetWindowRect(handle, out rect))
-							return Point.Round(new Point(rect.left, rect.top).ScreenToLogical(SwfScreen));
+							location = new Point(rect.left, rect.top);
 					}
 					finally
 					{
 						if (oldDpiAwareness != Win32.DPI_AWARENESS_CONTEXT.NONE)
 							Win32.SetThreadDpiAwarenessContext(oldDpiAwareness);
 					}
+
+					if (location != null)
+						return Point.Round(location.Value.ScreenToLogical(SwfScreen));
 				}
 				// in WPF, left/top of a window is transformed by the (current) screen dpi, which makes absolutely no sense.
 				var left = Control.Left;