SwiftWin32: extract the ScaleClient(rect:for:_)

This refactors the DPI scaling for the rectangle to a function that we
can use more broadly internally.  The broader availability prepares us
for fixing higher DPI displays.

Author: compnerd

Sources/SwiftWin32/CG/Rect.swift

@@ -1,8 +1,8 @@
 // Copyright © 2019 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
-@_implementationOnly import func CRT.floor
-@_implementationOnly import func CRT.ceil
+import CRT
+import WinSDK
 
 @inline(__always)
 private func __equals(_ lhs: Rect, _ rhs: Rect) -> Bool {
@@ -275,3 +275,17 @@ extension Rect: CustomDebugStringConvertible {
     return "Rect(origin: \(origin), size: \(size))"
   }
 }
+
+extension Rect {
+  internal func scaled(for dpi: UINT, style: WindowStyle) -> Rect {
+    let scale: Double = Double(dpi) / Double(USER_DEFAULT_SCREEN_DPI)
+
+    var r: RECT =
+        RECT(from: self.applying(AffineTransform(scaleX: scale, y: scale)))
+    if !AdjustWindowRectExForDpi(&r, style.base, false, style.extended, dpi) {
+      log.warning("AdjustWindowRectExForDpi: \(Error(win32: GetLastError()))")
+    }
+
+    return Rect(from: r)
+  }
+}

Sources/SwiftWin32/Views and Controls/View.swift

@@ -60,17 +60,6 @@ private func ClientToWindow(size: inout Size, for style: WindowStyle) {
   size = Size(width: Double(r.right - r.left), height: Double(r.bottom - r.top))
 }
 
-private func ScaleClient(rect: inout Rect, for dpi: UINT, _ style: WindowStyle) {
-  let scale: Double = Double(dpi) / Double(USER_DEFAULT_SCREEN_DPI)
-
-  var r: RECT =
-      RECT(from: rect.applying(AffineTransform(scaleX: scale, y: scale)))
-  if !AdjustWindowRectExForDpi(&r, style.base, false, style.extended, dpi) {
-    log.warning("AdjustWindowRectExForDpi: \(Error(win32: GetLastError()))")
-  }
-  rect = Rect(from: r)
-}
-
 private func WindowBasedTransform(for view: View?) -> AffineTransform {
   guard var view = view else { return .identity }
 
@@ -479,7 +468,7 @@ public class View: Responder {
     }
 
     // Scale window for DPI
-    ScaleClient(rect: &client, for: GetDpiForWindow(self.hWnd), style)
+    client = client.scaled(for: GetDpiForWindow(self.hWnd), style: style)
 
     // Resize and Position the Window
     SetWindowPos(self.hWnd, nil,
@@ -543,10 +532,10 @@ public class View: Responder {
   public var frame: Rect {
     didSet {
       // Scale window for DPI
-      var client: Rect = self.frame
-      ScaleClient(rect: &client, for: GetDpiForWindow(self.hWnd),
-                  WindowStyle(DWORD(bitPattern: self.GWL_STYLE),
-                              DWORD(bitPattern: self.GWL_EXSTYLE)))
+      let client: Rect =
+          self.frame.scaled(for: GetDpiForWindow(self.hWnd),
+                            style: WindowStyle(DWORD(bitPattern: self.GWL_STYLE),
+                                               DWORD(bitPattern: self.GWL_EXSTYLE)))
 
       // Resize and Position the Window
       _ = SetWindowPos(self.hWnd, nil,
@@ -703,8 +692,8 @@ public class View: Responder {
         WindowStyle(DWORD(bitPattern: view.GWL_STYLE),
                     DWORD(bitPattern: view.GWL_EXSTYLE))
 
-    var client: Rect = view.frame
-    ScaleClient(rect: &client, for: GetDpiForWindow(view.hWnd), style)
+    let client: Rect =
+        view.frame.scaled(for: GetDpiForWindow(view.hWnd), style: style)
 
     // Resize and Position the Window
     _ = SetWindowPos(view.hWnd, nil,