fix: closing alttab windows gives focus to previous app (closes lwoui…

…s#3577)
Allsochen · Aug 30, 2024 · 0e6f200 · 0e6f200
1 parent e890a60
commit 0e6f200
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/api-wrappers/HelperExtensions.swift b/src/api-wrappers/HelperExtensions.swift
@@ -189,3 +189,11 @@ extension Optional where Wrapped == String {
         return (self ?? "").localizedStandardCompare(string ?? "")
     }
 }
+
+extension NSWindow {
+    func hideAppIfLastWindowIsClosed() {
+        if (!NSApp.windows.contains { $0.isVisible && $0.className != "NSStatusBarWindow" && $0.windowNumber != windowNumber}) {
+            App.shared.hide(nil)
+        }
+    }
+}
diff --git a/src/ui/FeedbackWindow.swift b/src/ui/FeedbackWindow.swift
@@ -125,4 +125,9 @@ class FeedbackWindow: NSWindow {
         }
         return result
     }
+
+    override func close() {
+        hideAppIfLastWindowIsClosed()
+        super.close()
+    }
 }
diff --git a/src/ui/preferences-window/PreferencesWindow.swift b/src/ui/preferences-window/PreferencesWindow.swift
@@ -96,4 +96,9 @@ class PreferencesWindow: NSWindow, NSToolbarDelegate {
     func toolbarSelectableItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
         return Array(toolbarItems.keys)
     }
+
+    override func close() {
+        hideAppIfLastWindowIsClosed()
+        super.close()
+    }
 }