Run refreshAndLayout when mouse clicks outside of the focused window …

…rectangle #445 (comment)
nikitabobko · Nov 4, 2024 · 00cbb63 · 00cbb63
1 parent 0ab5fde
commit 00cbb63
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/Sources/AppBundle/GlobalObserver.swift b/Sources/AppBundle/GlobalObserver.swift
@@ -41,12 +41,20 @@ class GlobalObserver {
 
         NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseUp]) { _ in
             resetManipulatedWithMouseIfPossible()
-            // Detect clicks on desktop of different monitors
+            let mouseLocation = mouseLocation
             let clickedMonitor = mouseLocation.monitorApproximation
-            if clickedMonitor.activeWorkspace != focus.workspace {
-                _ = refreshSession {
-                    clickedMonitor.activeWorkspace.focusWorkspace()
-                }
+            let focus = focus
+            switch () {
+                // Detect clicks on desktop of different monitors
+                case _ where clickedMonitor.activeWorkspace != focus.workspace:
+                    _ = refreshSession {
+                        clickedMonitor.activeWorkspace.focusWorkspace()
+                    }
+                // Detect close button clicks for unfocused windows
+                case _ where  focus.windowOrNil?.getRect()?.contains(mouseLocation) == false: // todo replace getRect with preflushRect when it later becomes available
+                    refreshAndLayout()
+                default:
+                    break
             }
         }
     }