Add check for last switch <1s

#1089 closes #1099
nikitabobko · Feb 16, 2025 · 7d5aea1 · 7d5aea1
1 parent cb60284
commit 7d5aea1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Sources/AppBundle/focus.swift b/Sources/AppBundle/focus.swift
@@ -104,7 +104,12 @@ extension Workspace {
 private var _lastKnownFocus: FrozenFocus = _focus
 
 // Used by workspace-back-and-forth
-var _prevFocusedWorkspaceName: String? = nil
+var _prevFocusedWorkspaceName: String? = nil {
+    didSet {
+        prevFocusedWorkspaceDate = .now
+    }
+}
+var prevFocusedWorkspaceDate: Date = .distantPast
 var prevFocusedWorkspace: Workspace? { _prevFocusedWorkspaceName.map { Workspace.get(byName: $0) } }
 
 // Used by focus-back-and-forth

diff --git a/Sources/AppBundle/tree/MacWindow.swift b/Sources/AppBundle/tree/MacWindow.swift
@@ -73,10 +73,10 @@ final class MacWindow: Window, CustomStringConvertible {
             AXObserverRemoveNotification(obs.obs, obs.ax, obs.notif)
         }
         axObservers = []
-        // todo the if is an approximation to filter out cases when window just closed itself (or was killed remotely)
-        //  we might want to track the time of the latest workspace switch to make the approximation more accurate
         let focus = focus
-        if let deadWindowWorkspace, deadWindowWorkspace == focus.workspace || deadWindowWorkspace == prevFocusedWorkspace {
+        if let deadWindowWorkspace, deadWindowWorkspace == focus.workspace ||
+            deadWindowWorkspace == prevFocusedWorkspace && prevFocusedWorkspaceDate.distance(to: .now) < 1
+        {
             switch parent.cases {
                 case .tilingContainer, .workspace, .macosHiddenAppsWindowsContainer, .macosFullscreenWindowsContainer:
                     let deadWindowFocus = deadWindowWorkspace.toLiveFocus()