🎨 Move display mode code into NSScreen+Extensions.swift

MrKai77 · Jan 10, 2025 · a91fd3e · a91fd3e
1 parent 0b26fa2
commit a91fd3e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/Loop/Extensions/NSScreen+Extensions.swift b/Loop/Extensions/NSScreen+Extensions.swift
@@ -16,6 +16,17 @@ extension NSScreen {
         return deviceDescription[key] as? CGDirectDisplayID
     }
 
+    var displayMode: CGDisplayMode? {
+        guard
+            let id = displayID,
+            let displayMode = CGDisplayCopyDisplayMode(id)
+        else {
+            return nil
+        }
+
+        return displayMode
+    }
+
     static var screenWithMouse: NSScreen? {
         let mouseLocation = NSEvent.mouseLocation
         let screens = NSScreen.screens

diff --git a/Loop/Window Management/WindowTransformAnimation.swift b/Loop/Window Management/WindowTransformAnimation.swift
@@ -28,7 +28,7 @@ class WindowTransformAnimation: NSAnimation {
         self.bounds = bounds
         self.completionHandler = completionHandler
         super.init(duration: 0.3, animationCurve: .easeOut)
-        self.frameRate = Self.getCurrentRefreshRate() ?? 60.0
+        self.frameRate = Float(NSScreen.main?.displayMode?.refreshRate ?? 60.0)
         self.animationBlockingMode = .nonblocking
         self.lastWindowFrame = originalFrame
 
@@ -94,14 +94,4 @@ class WindowTransformAnimation: NSAnimation {
             }
         }
     }
-
-    static func getCurrentRefreshRate() -> Float? {
-        guard let activeScreen = NSScreen.main,
-              let screenNumber = activeScreen.deviceDescription[NSDeviceDescriptionKey("NSScreenNumber")] as? CGDirectDisplayID,
-              let displayMode = CGDisplayCopyDisplayMode(screenNumber) else {
-            return nil
-        }
-
-        return Float(displayMode.refreshRate)
-    }
 }