fix: reduced blinking while activating workspace

Resolves #69
wojciech-kulik · Feb 3, 2025 · 62a402a · 62a402a
1 parent a7e429d
commit 62a402a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/FlashSpace/Extensions/NSRunningApplication.swift b/FlashSpace/Extensions/NSRunningApplication.swift
@@ -52,6 +52,15 @@ extension NSRunningApplication {
         }
     }
 
+    var isMinimized: Bool {
+        guard let mainWindow else { return false }
+
+        var minimized: CFTypeRef?
+        AXUIElementCopyAttributeValue(mainWindow, NSAccessibility.Attribute.minimized as CFString, &minimized)
+
+        return minimized as? Bool == true
+    }
+
     func raise() {
         guard let mainWindow else {
             unhide()

diff --git a/FlashSpace/Settings/MenuBarSettingsView.swift b/FlashSpace/Settings/MenuBarSettingsView.swift
@@ -12,7 +12,7 @@ struct MenuBarSettingsView: View {
 
     var body: some View {
         Form {
-            Section(header: Text("Menu Bar")) {
+            Section {
                 Toggle("Show Title", isOn: $settings.showMenuBarTitle)
 
                 HStack {

diff --git a/FlashSpace/Workspaces/WorkspaceManager.swift b/FlashSpace/Workspaces/WorkspaceManager.swift
@@ -62,7 +62,6 @@ final class WorkspaceManager: ObservableObject {
 
         NotificationCenter.default
             .publisher(for: NSApplication.didChangeScreenParametersNotification)
-            .print()
             .sink { [weak self] _ in
                 self?.activeWorkspace = [:]
                 self?.mostRecentWorkspace = [:]
@@ -91,7 +90,7 @@ final class WorkspaceManager: ObservableObject {
         let regularApps = NSWorkspace.shared.runningApplications
             .filter { $0.activationPolicy == .regular }
         let floatingApps = (settingsRepository.floatingApps ?? [])
-        let appsToShow = regularApps
+        var appsToShow = regularApps
             .filter {
                 workspace.apps.contains($0.localizedName ?? "") ||
                     floatingApps.contains($0.localizedName ?? "") &&
@@ -101,16 +100,31 @@ final class WorkspaceManager: ObservableObject {
         observeFocusCancellable = nil
         defer { observeFocus() }
 
-        for app in appsToShow {
-            print("SHOW: \(app.localizedName ?? "")")
-            app.raise()
-        }
-
         if setFocus {
             let toFocus = findAppToFocus(in: workspace, apps: appsToShow)
+
+            // Make sure to raise the app that should be focused
+            // as the last one
+            if let toFocus {
+                appsToShow.removeAll { $0 == toFocus }
+                appsToShow.append(toFocus)
+            }
+
+            for app in appsToShow {
+                print("SHOW: \(app.localizedName ?? "")")
+                if app.isHidden || app.isMinimized {
+                    app.raise()
+                }
+            }
+
             print("FOCUS: \(toFocus?.localizedName ?? "")")
             toFocus?.activate()
             centerCursorIfNeeded(in: toFocus?.frame)
+        } else {
+            for app in appsToShow {
+                print("SHOW: \(app.localizedName ?? "")")
+                app.raise()
+            }
         }
     }