fix: fix context menu

Author: aitiotekt

CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to DockCleat will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2025-12-15
+
+### Fixed
+- Fixed "Open Main Window" functionality when "Show in Dock" is disabled
+- Fixed symbol name error in menu bar language selection (empty string causing "No symbol named '' found" error)
+- Fixed duplicate restart dialogs appearing in both main window and menu bar
+- Fixed window creation logic to properly handle accessory mode (no Dock icon)
+- Fixed compilation error with `nonisolated deinit` for GitHub Actions compatibility
+- Improved restart dialog display logic to show in menu bar when main window is closed
+
+### Changed
+- Improved window opening mechanism using WindowOpener singleton for better SwiftUI integration
+- Menu bar restart dialog now only appears when main window is not visible
+- Language selection menu items now use conditional rendering instead of empty string symbols
+
+### Technical
+- Implemented WindowOpener helper class to store and use SwiftUI's openWindow action
+- Added temporary activation policy switching to ensure window creation in accessory mode
+- Removed experimental `nonisolated deinit` keyword for better compiler compatibility
+- Added `--test` flag to build-release.sh script to skip notarization for local testing
+
 ## [1.0.1] - 2025-12-14
 
 ### Fixed

DockCleat.xcodeproj/project.pbxproj

@@ -258,7 +258,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = JDMS6RY775;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -277,7 +277,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aitiotekt.dockcleat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -301,7 +301,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = JDMS6RY775;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -320,7 +320,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aitiotekt.dockcleat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

DockCleat/DockCleatApp.swift

@@ -8,14 +8,58 @@
 
 import SwiftUI
 
+// MARK: - Window Opener Helper
+
+/// A singleton to store the openWindow action for use outside SwiftUI context
+@MainActor
+class WindowOpener {
+    static let shared = WindowOpener()
+    
+    var openWindowAction: ((String) -> Void)?
+    
+    private init() {}
+    
+    func openMainWindow() {
+        let shouldHideDock = !AppSettings.shared.showInDock
+        
+        // Temporarily set to regular mode to allow window creation
+        if shouldHideDock {
+            NSApp.setActivationPolicy(.regular)
+        }
+        
+        // Activate app
+        NSApp.activate(ignoringOtherApps: true)
+        
+        // Call the stored openWindow action
+        if let action = openWindowAction {
+            print("[WindowOpener] Opening window with stored action")
+            action("main")
+            
+            // Restore accessory mode after window is shown
+            if shouldHideDock {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                    NSApp.setActivationPolicy(.accessory)
+                }
+            }
+        } else {
+            print("[WindowOpener] No openWindow action stored, trying fallback...")
+            // Fallback: restore accessory mode
+            if shouldHideDock {
+                NSApp.setActivationPolicy(.accessory)
+            }
+        }
+    }
+}
+
 @main
 struct DockCleatApp: App {
     /// Use NSApplicationDelegateAdaptor to integrate AppDelegate with SwiftUI lifecycle
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
 
     @StateObject private var settings = AppSettings.shared
     @StateObject private var monitorService = DockMonitorService.shared
-    @State private var showingSettings = false
+    
+    @Environment(\.openWindow) private var openWindow
 
     init() {
         // Request accessibility permission as early as possible
@@ -26,13 +70,22 @@ struct DockCleatApp: App {
     }
 
     var body: some Scene {
-        // Main Window
-        WindowGroup {
+        // Main Window with ID for programmatic opening
+        WindowGroup(id: "main") {
             ContentView()
                 .environmentObject(settings)
                 .environmentObject(monitorService)
                 .preferredColorScheme(settings.appTheme.colorScheme)
                 .environment(\.locale, settings.currentLocale)
+                .task {
+                    // Store the openWindow action when ContentView appears
+                    await MainActor.run {
+                        WindowOpener.shared.openWindowAction = { id in
+                            openWindow(id: id)
+                        }
+                        print("[DockCleatApp] Stored openWindow action")
+                    }
+                }
         }
         .windowStyle(.hiddenTitleBar)
         .windowResizability(.contentSize)
@@ -69,6 +122,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             // Start monitoring service after app is fully launched
             DockMonitorService.shared.startMonitoring()
         }
+        
+        // Listen for window open requests
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(handleOpenWindowRequest),
+            name: NSNotification.Name("RequestMainWindow"),
+            object: nil
+        )
+    }
+    
+    @objc private func handleOpenWindowRequest() {
+        // Use WindowOpener to open the main window
+        Task { @MainActor in
+            WindowOpener.shared.openMainWindow()
+        }
     }
 
     func applicationWillTerminate(_ notification: Notification) {

DockCleat/MenuBarManager.swift

@@ -160,7 +160,6 @@ class MenuBarManager: NSObject, ObservableObject {
         if popover == nil {
             popover = NSPopover()
             popover?.behavior = .transient
-            popover?.contentSize = NSSize(width: 260, height: 500)
             popover?.delegate = self
 
             // Create hosting view with MenuBarView
@@ -170,21 +169,38 @@ class MenuBarManager: NSObject, ObservableObject {
                 .preferredColorScheme(settings.appTheme.colorScheme)
                 .environment(\.locale, settings.currentLocale)
 
-            // Create hosting view with proper configuration to avoid layout warnings
-            // Use fixed size to prevent layout recursion
-            hostingView = NSHostingView(
-                rootView: AnyView(menuBarView.frame(width: 260, height: 500))
-            )
+            // Create hosting view - let SwiftUI determine the height
+            hostingView = NSHostingView(rootView: AnyView(menuBarView))
+            
+            // Create view controller
+            let viewController = NSViewController()
 
-            // Set frame after creation to avoid layout during initialization
             if let hostingView = hostingView {
-                hostingView.frame = NSRect(x: 0, y: 0, width: 260, height: 500)
-                hostingView.autoresizingMask = [.width, .height]
+                // Set initial frame - will be adjusted based on content
+                hostingView.frame = NSRect(x: 0, y: 0, width: 260, height: 400)
             }
 
-            let viewController = NSViewController()
             viewController.view = hostingView ?? NSView()
             popover?.contentViewController = viewController
+            
+            // Update popover size after view has laid out
+            // Use async to avoid layout recursion warnings
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self,
+                      let hostingView = self.hostingView,
+                      let popover = self.popover else { return }
+                
+                // Get the preferred size from the hosting view
+                // This calculates the size based on SwiftUI content
+                let preferredSize = hostingView.fittingSize
+                let contentHeight = max(300, preferredSize.height) // Minimum height of 300
+                
+                // Update hosting view frame to match content
+                hostingView.frame = NSRect(x: 0, y: 0, width: 260, height: contentHeight)
+                
+                // Update popover size to match content
+                popover.contentSize = NSSize(width: 260, height: contentHeight)
+            }
         }
 
         // Show popover
@@ -201,9 +217,10 @@ class MenuBarManager: NSObject, ObservableObject {
 
     // MARK: - Cleanup
 
-    nonisolated deinit {
-        // Clean up status item synchronously
-        // Note: This is safe because NSStatusBar operations are thread-safe
+    deinit {
+        // Clean up status item
+        // Note: Since MenuBarManager is @MainActor, deinit is called on main thread
+        // NSStatusBar operations are thread-safe, so this is safe
         if let statusItem = statusItem {
             NSStatusBar.system.removeStatusItem(statusItem)
         }

DockCleat/MenuBarView.swift

@@ -72,7 +72,21 @@ struct MenuBarView: View {
             hasAccessibilityPermission = AccessibilityService.shared.isAccessibilityEnabled
         }
         .onReceive(NotificationCenter.default.publisher(for: .showLanguageRestartDialog)) { _ in
-            showRestartDialog = true
+            // Check if main window is open - if so, let it handle the dialog
+            // If main window is closed, show dialog in menu bar
+            let hasMainWindow = NSApp.windows.contains { window in
+                let className = window.className
+                return !className.contains("NSPopover") &&
+                       !className.contains("NSStatusBarWindow") &&
+                       !className.contains("NSPanel") &&
+                       window.canBecomeKey &&
+                       window.isVisible
+            }
+            
+            // Only show dialog if no main window is visible
+            if !hasMainWindow {
+                showRestartDialog = true
+            }
         }
         .alert(String(localized: "Restart Required"), isPresented: $showRestartDialog) {
             Button(String(localized: "Restart Now")) {
@@ -230,9 +244,14 @@ struct MenuBarView: View {
                     settings.targetScreenID = screen.id
                 } label: {
                     HStack(spacing: 10) {
-                        Image(systemName: settings.targetScreenID == screen.id ? "checkmark" : "")
-                            .font(.system(size: 12))
-                            .frame(width: 16)
+                        if settings.targetScreenID == screen.id {
+                            Image(systemName: "checkmark")
+                                .font(.system(size: 12))
+                                .frame(width: 16)
+                        } else {
+                            Spacer()
+                                .frame(width: 16)
+                        }
 
                         Text(screen.name)
                             .font(.system(size: 13))
@@ -258,9 +277,14 @@ struct MenuBarView: View {
                     settings.dockPosition = position
                 } label: {
                     HStack(spacing: 10) {
-                        Image(systemName: settings.dockPosition == position ? "checkmark" : "")
-                            .font(.system(size: 12))
-                            .frame(width: 16)
+                        if settings.dockPosition == position {
+                            Image(systemName: "checkmark")
+                                .font(.system(size: 12))
+                                .frame(width: 16)
+                        } else {
+                            Spacer()
+                                .frame(width: 16)
+                        }
 
                         Text(position.localizedName)
                             .font(.system(size: 13))
@@ -305,9 +329,14 @@ struct MenuBarView: View {
                     settings.appLanguage = language
                 } label: {
                     HStack(spacing: 10) {
-                        Image(systemName: settings.appLanguage == language ? "checkmark" : "")
-                            .font(.system(size: 12))
-                            .frame(width: 16)
+                        if settings.appLanguage == language {
+                            Image(systemName: "checkmark")
+                                .font(.system(size: 12))
+                                .frame(width: 16)
+                        } else {
+                            Spacer()
+                                .frame(width: 16)
+                        }
 
                         Text(language.displayNameForPicker)
                             .font(.system(size: 13))
@@ -371,23 +400,12 @@ struct MenuBarView: View {
     }
 
     private func openMainWindow() {
-        // Activate app and bring window to front
-        NSApp.activate(ignoringOtherApps: true)
-
-        // Open or focus the main window
-        if let window = NSApp.windows.first(where: {
-            $0.title.contains("DockCleat") || $0.isVisible == false
-        }) {
-            window.makeKeyAndOrderFront(nil)
-        } else {
-            // If no window exists, create one
-            for window in NSApp.windows {
-                if window.contentView != nil {
-                    window.makeKeyAndOrderFront(nil)
-                    break
-                }
-            }
-        }
+        // Close popover if open
+        dismiss()
+        
+        // Send notification to AppDelegate to handle window creation
+        // AppDelegate has the proper context to create SwiftUI windows
+        NotificationCenter.default.post(name: NSNotification.Name("RequestMainWindow"), object: nil)
     }
 }