Fix bug where closing the main window didn't work properly.

Author: zenangst

App/Sources/UI/Releases/Release3_27.swift

@@ -2,6 +2,8 @@ import Bonzai
 import Inject
 import SwiftUI
 
+private let currentVersion: Version = .v3273
+
 struct Release3_27: View {
   @ObserveInjection var inject
   enum ButtonAction {
@@ -111,12 +113,12 @@ private struct HeaderOverlay: View {
     HStack(alignment: .center) {
       Text("Keyboard Cowboy")
         .font(Font.system(size: 20, design: .rounded))
-      Text("3.27.2")
+      Text(currentVersion.rawValue)
         .foregroundStyle(.white)
         .font(Font.system(size: 24, design: .rounded))
         .allowsTightening(true)
         .fontWeight(.heavy)
-        .shadow(color: Color(.systemOrange), radius: 10)
+        .shadow(color: currentVersion.color, radius: 10)
     }
     .padding(.vertical, 8)
     .padding(.horizontal, 16)
@@ -161,6 +163,10 @@ private struct ChangesView: View {
   @ObserveInjection var inject
 
   private let changes: [Change<AnyView>] = [
+    Change(icon: { BugFixIconView(size: 24).anyView },
+           text: "Fix bug where closing the main window didn't work as expected.",
+           version: .v3273),
+
     Change(icon: { BugFixIconView(size: 24).anyView },
            text: "Fix bug where keyboard sequences became unreliable.",
            version: .v3272),

App/Sources/UI/Windows/MainWindow.swift

@@ -5,12 +5,16 @@ import SwiftUI
 @MainActor
 final class MainWindow: NSObject, NSWindowDelegate {
   private var window: NSWindow?
-  private let core: Core
   private let windowOpener: WindowOpener
+  private let core: Core
+
+  private(set) static var shared: MainWindow!
 
-  init(core: Core) {
+  init(core: Core, windowOpener: WindowOpener) {
     self.core = core
-    self.windowOpener = WindowOpener(core: core)
+    self.windowOpener = windowOpener
+    super.init()
+    Self.shared = self
   }
 
   func open() {

App/Sources/UI/Windows/WindowOpener.swift

@@ -4,15 +4,17 @@ import SwiftUI
 @MainActor
 final class WindowOpener: ObservableObject {
   private let core: Core
+  private var mainWindow: MainWindow!
   private lazy var windowSwitcherWindow = WindowSwitcherWindow(commandRunner: core.commandRunner)
 
   init(core: Core) {
     self.core = core
+    self.mainWindow = MainWindow.shared ?? MainWindow(core: core, windowOpener: self)
     NotificationCenter.default.addObserver(self, selector: #selector(openMainWindow), name: .openKeyboardCowboy, object: nil)
   }
 
   @objc func openMainWindow() {
-    MainWindow(core: core).open()
+    mainWindow.open()
   }
 
   func openWindowSwitcher(_ snapshot: UserSpace.Snapshot) {

Project.swift

@@ -55,7 +55,7 @@ let mainAppTarget = Target.target(
         "CURRENT_PROJECT_VERSION": SettingValue(stringLiteral: buildNumber),
         "DEVELOPMENT_TEAM": env["TEAM_ID"],
         "ENABLE_HARDENED_RUNTIME": true,
-        "MARKETING_VERSION": "3.27.2",
+        "MARKETING_VERSION": "3.27.3",
         "PRODUCT_NAME": "Keyboard Cowboy",
         "SWIFT_STRICT_CONCURRENCY": "complete",
         "SWIFT_VERSION": "6.0",