macOS: Fix missing icon in menu bar

Packages/App/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift

@@ -49,7 +49,7 @@ public struct AppMenu: View {
     public var body: some View {
         versionItem
         Divider()
-        showToggle
+        showButton
         loginToggle
         keepToggle
         Divider()
@@ -73,9 +73,18 @@ private extension AppMenu {
         Text(BundleConfiguration.mainVersionString)
     }
 
-    var showToggle: some View {
+    var showButton: some View {
         Button(Strings.Global.Actions.show) {
-            settings.isVisible = true
+            Task {
+                let url = Bundle.main.bundleURL
+                let config = NSWorkspace.OpenConfiguration()
+                config.createsNewApplicationInstance = false
+                do {
+                    try await NSWorkspace.shared.openApplication(at: url, configuration: config)
+                } catch {
+                    pp_log(.app, .error, "Unable to reopen app: \(error)")
+                }
+            }
         }
     }
 

Packages/App/Sources/CommonUtils/Views/AppWindow.swift

@@ -33,15 +33,15 @@ public final class AppWindow {
 
     public var isVisible: Bool {
         get {
-            NSApp.activationPolicy() == .regular && window.isVisible
+            NSApp.activationPolicy() == .regular && window?.isVisible == true
         }
         set {
             NSApp.setActivationPolicy(newValue ? .regular : .accessory)
             if newValue {
                 NSApp.activate(ignoringOtherApps: true)
-                window.makeKeyAndOrderFront(self)
+                window?.makeKeyAndOrderFront(self)
             } else {
-                window.close()
+                window?.close()
             }
         }
     }
@@ -51,11 +51,14 @@ public final class AppWindow {
 }
 
 private extension AppWindow {
-    var window: NSWindow {
-        guard let window = NSApp.windows.first else {
-            fatalError("No Mac window?")
-        }
-        return window
+    var window: NSWindow? {
+        NSApp.windows.first(where: \.isWindow)
+    }
+}
+
+private extension NSWindow {
+    var isWindow: Bool {
+        !className.contains("NSStatusBar")
     }
 }
 

Packages/App/Sources/UILibrary/Business/MacSettingsModel.swift

@@ -35,29 +35,18 @@ import ServiceManagement
 public final class MacSettingsModel: ObservableObject {
     private let defaults: UserDefaults
 
-    private let appWindow: AppWindow
-
     private let appService: SMAppService
 
     public var isStartedFromLoginItem: Bool {
         NSApp.isHidden
     }
 
-    public var isVisible: Bool {
-        get {
-            appWindow.isVisible
-        }
-        set {
-            appWindow.isVisible = newValue
-            objectWillChange.send()
-        }
-    }
-
     public var launchesOnLogin: Bool {
         get {
             appService.status == .enabled
         }
         set {
+            objectWillChange.send()
             do {
                 if newValue {
                     try appService.register()
@@ -67,7 +56,6 @@ public final class MacSettingsModel: ObservableObject {
             } catch {
                 pp_log(.app, .error, "Unable to (un)register login item: \(error)")
             }
-            objectWillChange.send()
         }
     }
 
@@ -76,14 +64,13 @@ public final class MacSettingsModel: ObservableObject {
             defaults.bool(forKey: UIPreference.keepsInMenu.key)
         }
         set {
-            defaults.set(newValue, forKey: UIPreference.keepsInMenu.key)
             objectWillChange.send()
+            defaults.set(newValue, forKey: UIPreference.keepsInMenu.key)
         }
     }
 
-    public init(defaults: UserDefaults, appWindow: AppWindow, loginItemId: String) {
+    public init(defaults: UserDefaults, loginItemId: String) {
         self.defaults = defaults
-        self.appWindow = appWindow
         appService = SMAppService.loginItem(identifier: loginItemId)
     }
 }

Passepartout/App/AppDelegate.swift

@@ -43,7 +43,6 @@ final class AppDelegate: NSObject {
 #if os(macOS)
     let settings = MacSettingsModel(
         defaults: .standard,
-        appWindow: .shared,
         loginItemId: BundleConfiguration.mainString(for: .loginItemId)
     )
 #endif