Workaround for Sequoia launch behavior

Author: jordanbaird

Ice/Main/AppDelegate.swift

@@ -41,27 +41,24 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             }
         }
 
-        // On macOS 15, the windows handle their own closure. If on macOS 14,
-        // close them here.
-        //
-        // NOTE: The windows might not close when running from Xcode, but it
-        // does work when running standalone.
-        if #unavailable(macOS 15.0) {
+        // Temporary hack to make sure the window opens on Sequoia is to
+        // let them open, wait a bit, then close them.
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             appState.settingsWindow?.close()
             appState.permissionsWindow?.close()
-        }
 
-        if !appState.isPreview {
-            // If we have the required permissions, set up the shared app state.
-            // Otherwise, open the permissions window.
-            if appState.permissionsManager.hasPermission {
-                appState.performSetup()
-            } else if let permissionsWindow = appState.permissionsWindow {
-                appState.activate(withPolicy: .regular)
-                permissionsWindow.center()
-                permissionsWindow.makeKeyAndOrderFront(nil)
-            } else {
-                Logger.appDelegate.error("Failed to open permissions window")
+            if !appState.isPreview {
+                // If we have the required permissions, set up the shared app state.
+                // Otherwise, open the permissions window.
+                if appState.permissionsManager.hasPermission {
+                    appState.performSetup()
+                } else if let permissionsWindow = appState.permissionsWindow {
+                    appState.activate(withPolicy: .regular)
+                    permissionsWindow.center()
+                    permissionsWindow.makeKeyAndOrderFront(nil)
+                } else {
+                    Logger.appDelegate.error("Failed to open permissions window")
+                }
             }
         }
     }

Ice/Settings/SettingsWindow.swift

@@ -7,6 +7,7 @@ import SwiftUI
 
 struct SettingsWindow: Scene {
     @ObservedObject var appState: AppState
+    @Environment(\.openWindow) private var openWindow
 
     var body: some Scene {
         settingsWindow
@@ -19,18 +20,15 @@ struct SettingsWindow: Scene {
 
     private var settingsWindow: some Scene {
         if #available(macOS 15.0, *) {
-            return SettingsWindowMacOS15()
+            return window
+                .defaultLaunchBehavior(.presented)
         } else {
-            return SettingsWindowMacOS14()
+            return window
         }
     }
-}
-
-@available(macOS 14.0, *)
-private struct SettingsWindowMacOS14: Scene {
-    @Environment(\.openWindow) private var openWindow
 
-    var body: some Scene {
+    @SceneBuilder
+    private var window: some Scene {
         Window(Constants.settingsWindowTitle, id: Constants.settingsWindowID) {
             SettingsView()
                 .once {
@@ -39,20 +37,3 @@ private struct SettingsWindowMacOS14: Scene {
         }
     }
 }
-
-@available(macOS 15.0, *)
-private struct SettingsWindowMacOS15: Scene {
-    @Environment(\.dismissWindow) private var dismissWindow
-    @State private var launchBehavior: SceneLaunchBehavior = .presented
-
-    var body: some Scene {
-        Window(Constants.settingsWindowTitle, id: Constants.settingsWindowID) {
-            SettingsView()
-                .once {
-                    dismissWindow(id: Constants.settingsWindowID)
-                    launchBehavior = .suppressed // Keep the window from reopening.
-                }
-        }
-        .defaultLaunchBehavior(launchBehavior)
-    }
-}