WPF - GetScreenInfo scale Rect/AvailableRect

Scale by DpiScaleFactor

Author: amaitland

CefSharp.Wpf/ChromiumWebBrowser.cs

@@ -732,11 +732,20 @@ private void InternalDispose(bool disposing)
         /// <returns>ScreenInfo containing the current DPI scale factor</returns>
         protected virtual ScreenInfo? GetScreenInfo()
         {
+            Rect rect = monitorInfo.Monitor;
+            Rect availableRect = monitorInfo.WorkArea;
+
+            if (DpiScaleFactor > 1.0)
+            {
+                rect = rect.ScaleByDpi(DpiScaleFactor);
+                availableRect = availableRect.ScaleByDpi(DpiScaleFactor);
+            }
+
             var screenInfo = new ScreenInfo
             {
                 DeviceScaleFactor = (float)DpiScaleFactor,
-                Rect = monitorInfo.Monitor, //TODO: Do values need to be scaled?
-                AvailableRect = monitorInfo.WorkArea //TODO: Do values need to be scaled?
+                Rect = rect,
+                AvailableRect = availableRect
             };
 
             return screenInfo;

CefSharp/Structs/Rect.cs

@@ -2,6 +2,7 @@
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
+using System;
 using System.Diagnostics;
 
 namespace CefSharp.Structs
@@ -47,5 +48,20 @@ public Rect(int x, int y, int width, int height)
             Width = width;
             Height = height;
         }
+
+        /// <summary>
+        /// Returns a new Rect with Scaled values
+        /// </summary>
+        /// <param name="dpi">Dpi to scale by</param>
+        /// <returns>New rect with scaled values</returns>
+        public Rect ScaleByDpi(double dpi)
+        {
+            var x = (int)Math.Floor(X / dpi);
+            var y = (int)Math.Floor(Y / dpi);
+            var width = (int)Math.Floor(Width / dpi);
+            var height = (int)Math.Floor(Height / dpi);
+
+            return new Rect(x, y, width, height);
+        }
     }
 }