fix: restore main window when video is open (#56)

Author: sozercan

App/AppDelegate.swift

@@ -11,6 +11,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     /// Set by KasetApp after initialization.
     weak var playerService: PlayerService?
 
+    /// Reference to the main window for reliable reopen behavior.
+    /// Using strong reference to prevent deallocation when window is hidden.
+    private var mainWindow: NSWindow?
+
     func applicationDidFinishLaunching(_: Notification) {
         // Set up notification center delegate to show notifications in foreground
         UNUserNotificationCenter.current().delegate = self
@@ -27,14 +31,26 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
+    func applicationDidBecomeActive(_: Notification) {
+        // When app becomes active (e.g., dock icon clicked), ensure main window is visible.
+        // This handles the case where video window is visible but main window is hidden.
+        self.showMainWindowIfNeeded()
+    }
+
     private func setupWindowDelegate() {
         for window in NSApplication.shared.windows where window.canBecomeMain {
+            // Skip if this is the video window (has specific identifier)
+            if window.identifier?.rawValue == AccessibilityID.VideoWindow.container {
+                continue
+            }
             window.delegate = self
             // Enable automatic window frame persistence using autosave name
             // This ensures window size/position is restored across app launches
             if window.frameAutosaveName.isEmpty {
                 window.setFrameAutosaveName("KasetMainWindow")
             }
+            // Store reference to main window for reliable reopen
+            self.mainWindow = window
         }
     }
 
@@ -111,15 +127,42 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     /// Handle reopen (clicking dock icon) when all windows are closed.
-    func applicationShouldHandleReopen(_: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
-        if !flag {
-            // Reopen the main window if it was closed
-            for window in NSApplication.shared.windows where window.canBecomeMain {
+    func applicationShouldHandleReopen(_: NSApplication, hasVisibleWindows _: Bool) -> Bool {
+        // Show main window when dock icon is clicked
+        self.showMainWindowIfNeeded()
+        return true
+    }
+
+    /// Shows the main window if it's not visible.
+    private func showMainWindowIfNeeded() {
+        // Try stored reference first
+        if let mainWindow {
+            if !mainWindow.isVisible {
+                mainWindow.makeKeyAndOrderFront(nil)
+            }
+            return
+        }
+
+        // Fallback: find main window by frameAutosaveName
+        for window in NSApplication.shared.windows where window.frameAutosaveName == "KasetMainWindow" {
+            self.mainWindow = window
+            if !window.isVisible {
                 window.makeKeyAndOrderFront(nil)
-                return true
             }
+            return
+        }
+
+        // Last resort: find any main-capable window that's not the video window
+        for window in NSApplication.shared.windows where window.canBecomeMain {
+            if window.identifier?.rawValue == AccessibilityID.VideoWindow.container {
+                continue
+            }
+            self.mainWindow = window
+            if !window.isVisible {
+                window.makeKeyAndOrderFront(nil)
+            }
+            return
         }
-        return true
     }
 }
 

App/KasetApp.swift

@@ -263,6 +263,34 @@ struct KasetApp: App {
                 }
                 .keyboardShortcut("k", modifiers: .command)
             }
+
+            // Window menu - show main window
+            CommandGroup(after: .windowArrangement) {
+                Button("Kaset") {
+                    self.showMainWindow()
+                }
+                .keyboardShortcut("0", modifiers: .command)
+            }
+        }
+    }
+
+    /// Shows the main window.
+    private func showMainWindow() {
+        // Find and show the main window
+        for window in NSApplication.shared.windows where window.frameAutosaveName == "KasetMainWindow" {
+            window.makeKeyAndOrderFront(nil)
+            NSApplication.shared.activate(ignoringOtherApps: true)
+            return
+        }
+
+        // Fallback: find any main-capable window that's not the video window
+        for window in NSApplication.shared.windows where window.canBecomeMain {
+            if window.identifier?.rawValue == AccessibilityID.VideoWindow.container {
+                continue
+            }
+            window.makeKeyAndOrderFront(nil)
+            NSApplication.shared.activate(ignoringOtherApps: true)
+            return
         }
     }
 

App/VideoWindowController.swift

@@ -11,7 +11,6 @@ final class VideoWindowController {
 
     private var window: NSWindow?
     private var hostingView: NSHostingView<AnyView>?
-    private let logger = DiagnosticsLogger.player
 
     /// Reference to PlayerService to sync showVideo state
     private weak var playerService: PlayerService?
@@ -35,8 +34,6 @@ final class VideoWindowController {
         playerService: PlayerService,
         webKitManager: WebKitManager
     ) {
-        self.logger.debug("VideoWindowController.show() called")
-
         // Store reference to sync state on close
         self.playerService = playerService
 
@@ -45,16 +42,13 @@ final class VideoWindowController {
 
         if let existingWindow = self.window {
             // Window exists - just bring it to front
-            self.logger.debug("Window already exists, bringing to front")
             self.isClosing = false // Reset in case of interrupted close
             existingWindow.makeKeyAndOrderFront(nil)
             // Ensure video mode is active
             SingletonPlayerWebView.shared.updateDisplayMode(.video)
             return
         }
 
-        self.logger.info("Creating new video window")
-
         let contentView = VideoPlayerWindow()
             .environment(playerService)
             .environment(webKitManager)
@@ -101,27 +95,16 @@ final class VideoWindowController {
         )
 
         // Update WebView display mode for video
-        self.logger.info("Calling updateDisplayMode(.video)")
         SingletonPlayerWebView.shared.updateDisplayMode(.video)
     }
 
     /// Closes the video window programmatically (called when showVideo becomes false).
     func close() {
-        self.logger.debug("VideoWindowController.close() called")
-
         // Prevent re-entrant calls
-        guard !self.isClosing else {
-            self.logger.debug("Already closing, skipping")
-            return
-        }
-
-        guard let window = self.window else {
-            self.logger.debug("No window to close")
-            return
-        }
+        guard !self.isClosing else { return }
+        guard let window = self.window else { return }
 
         self.isClosing = true
-        self.logger.info("Closing video window")
 
         // Remove observer before closing to prevent windowWillClose from firing
         NotificationCenter.default.removeObserver(self, name: NSWindow.willCloseNotification, object: window)
@@ -139,13 +122,8 @@ final class VideoWindowController {
 
     /// Called when window is closed via the red X button.
     @objc private func windowWillClose(_ notification: Notification) {
-        self.logger.info("windowWillClose notification received")
-
         // Prevent re-entrant calls
-        guard !self.isClosing else {
-            self.logger.debug("Already closing, skipping windowWillClose")
-            return
-        }
+        guard !self.isClosing else { return }
         self.isClosing = true
 
         // Update corner based on final position
@@ -160,15 +138,12 @@ final class VideoWindowController {
         // Sync PlayerService state - this handles close via red button
         // This will trigger MainWindow.onChange which calls close(), but isClosing prevents re-entry
         if self.playerService?.showVideo == true {
-            self.logger.debug("Syncing playerService.showVideo to false")
             self.playerService?.showVideo = false
         }
     }
 
     /// Shared cleanup logic for both close paths.
     private func performCleanup() {
-        self.logger.debug("performCleanup called")
-
         // Clear grace period
         self.playerService?.videoWindowDidClose()