Added a defaults config to allow the old way of obtaining the window …

…under the cursor
rxhanson · Sep 28, 2023 · df2f102 · df2f102
1 parent 5cc48ce
commit df2f102
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Rectangle/AccessibilityElement.swift b/Rectangle/AccessibilityElement.swift
@@ -298,7 +298,7 @@ extension AccessibilityElement {
 
     private static func getWindowInfo(_ location: CGPoint) -> WindowInfo? {
         let infoAtLocation = WindowUtil.getWindowList().first(where: {windowInfo in
-            windowInfo.level < 23
+            windowInfo.level < 23 // 23 is the level of the Notification Center
             && !["Dock", "WindowManager"].contains(windowInfo.processName)
             && windowInfo.frame.contains(location)
         })
@@ -314,6 +314,15 @@ extension AccessibilityElement {
 
     static func getWindowElementUnderCursor() -> AccessibilityElement? {
         let position = NSEvent.mouseLocation.screenFlipped
+
+        let systemWideFirst = Defaults.systemWideMouseDown.userEnabled
+
+        if systemWideFirst,
+            let element = AccessibilityElement(position),
+            let windowElement = element.windowElement {
+                return windowElement
+        }
+
         if let info = getWindowInfo(position) {
             if !Defaults.dragFromStage.userDisabled {
                 if StageUtil.stageCapable && StageUtil.stageEnabled,
@@ -333,7 +342,11 @@ extension AccessibilityElement {
                 }
             }
         }
-        if let element = AccessibilityElement(position), let windowElement = element.windowElement {
+
+        if !systemWideFirst,
+           let element = AccessibilityElement(position),
+           let windowElement = element.windowElement {
+
             if Logger.logging, let pid = windowElement.pid {
                 let appName = NSRunningApplication(processIdentifier: pid)?.localizedName ?? ""
                 Logger.log("Window under cursor fallback matched: \(appName)")

diff --git a/Rectangle/Defaults.swift b/Rectangle/Defaults.swift
@@ -82,6 +82,7 @@ class Defaults {
     static let doubleClickTitleBar = IntDefault(key: "doubleClickTitleBar")
     static let doubleClickTitleBarRestore = OptionalBoolDefault(key: "doubleClickTitleBarRestore")
     static let ignoreDragSnapToo = OptionalBoolDefault(key: "ignoreDragSnapToo")
+    static let systemWideMouseDown = OptionalBoolDefault(key: "systemWideMouseDown")
 
     static var array: [Default] = [
         launchOnLogin,
@@ -155,6 +156,7 @@ class Defaults {
         doubleClickTitleBar,
         doubleClickTitleBarRestore,
         ignoreDragSnapToo,
+        systemWideMouseDown
     ]
 }