Merge pull request #1 from jason5545/upstream-pr-batch

Batch merge upstream open PRs (auto-merged set)

Author: jason5545

.gitignore

@@ -1,3 +1,7 @@
 .DS_Store
 build/
 xcuserdata/
+
+# https://github.com/jordanbaird/Ice/pull/795
+DerivedData/
+

Ice.xcodeproj/project.pbxproj

@@ -312,6 +312,7 @@
 				CURRENT_PROJECT_VERSION = 1117;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
+				DEVELOPMENT_TEAM = 4YPY82PC7M;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -344,6 +345,7 @@
 				CURRENT_PROJECT_VERSION = 1117;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
+				DEVELOPMENT_TEAM = 4YPY82PC7M;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

Ice/Bridging/Bridging.swift

@@ -124,6 +124,7 @@ extension Bridging {
 
     private static func getMenuBarWindowList() -> [CGWindowID] {
         let windowCount = getWindowCount()
+        Logger.bridging.debug("getMenuBarWindowList: total window count = \(windowCount)")
         var list = [CGWindowID](repeating: 0, count: windowCount)
         var realCount: Int32 = 0
         let result = CGSGetProcessMenuBarWindowList(
@@ -137,6 +138,23 @@ extension Bridging {
             Logger.bridging.error("CGSGetProcessMenuBarWindowList failed with error \(result.logString)")
             return []
         }
+        Logger.bridging.debug("getMenuBarWindowList: found \(realCount) menu bar windows")
+        
+        // Debug: check for Ice windows in the list
+        let currentPID = ProcessInfo.processInfo.processIdentifier
+        for windowID in list[..<Int(realCount)] {
+            var pointer = UnsafeRawPointer(bitPattern: Int(windowID))
+            if let array = CFArrayCreate(kCFAllocatorDefault, &pointer, 1, nil),
+               let descList = CGWindowListCreateDescriptionFromArray(array) as? [[CFString: Any]],
+               let desc = descList.first,
+               let ownerPID = desc[kCGWindowOwnerPID] as? pid_t,
+               ownerPID == currentPID {
+                let layer = desc[kCGWindowLayer] as? Int ?? -1
+                let title = desc[kCGWindowName] as? String ?? "nil"
+                Logger.bridging.debug("Ice window in menubar list: windowID=\(windowID), layer=\(layer), title=\(title), expectedLayer=\(Int(kCGStatusWindowLevel))")
+            }
+        }
+        
         return [CGWindowID](list[..<Int(realCount)])
     }
 

Ice/Events/EventManager.swift

@@ -24,6 +24,9 @@ final class EventManager {
         guard let self else {
             return event
         }
+        if handleOpenSettingsFallback(with: event) {
+            return event
+        }
         switch event.type {
         case .leftMouseDown:
             handleShowOnClick()
@@ -265,6 +268,27 @@ extension EventManager {
         appState.menuBarManager.showRightClickMenu(at: mouseLocation)
     }
 
+    // MARK: Handle Open Settings Fallback
+
+    private func handleOpenSettingsFallback(with event: NSEvent) -> Bool {
+        guard
+            let appState,
+            !appState.settingsManager.advancedSettingsManager.showContextMenuOnRightClick,
+            event.type == .leftMouseDown || event.type == .rightMouseDown,
+            isMouseInsideMenuBar
+        else {
+            return false
+        }
+
+        let modifiers = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
+        guard modifiers.contains([.option, .command]) else {
+            return false
+        }
+
+        appState.appDelegate?.openSettingsWindow()
+        return true
+    }
+
     // MARK: Handle Prevent Show On Hover
 
     private func handlePreventShowOnHover(with event: NSEvent) {
@@ -452,6 +476,11 @@ extension EventManager {
         else {
             return false
         }
+        
+        if !NSScreen.screensHaveSeparateSpaces && screen != NSScreen.screens.first {
+            return false
+        }
+
         if appState.menuBarManager.isMenuBarHiddenBySystem || appState.isActiveSpaceFullscreen {
             if
                 let mouseLocation = MouseCursor.locationCoreGraphics,

Ice/Main/AppState.swift

@@ -188,6 +188,9 @@ final class AppState: ObservableObject {
         itemManager.performSetup()
         imageCache.performSetup()
         updatesManager.performSetup()
+		DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+			self?.updatesManager.startUpdater()
+		}
         userNotificationManager.performSetup()
     }
 

Ice/MenuBar/Appearance/MenuBarOverlayPanel.swift

@@ -328,6 +328,12 @@ final class MenuBarOverlayPanel: NSPanel {
             return
         }
 
+        // Validate before showing to ensure panel should be visible on this screen.
+        let windows = WindowInfo.getOnScreenWindows()
+        guard validate(for: .showing, with: windows) != nil else {
+            return
+        }
+
         guard let menuBarHeight = owningScreen.getMenuBarHeight() else {
             return
         }

Ice/MenuBar/ControlItem/ControlItem.swift

@@ -60,13 +60,46 @@ final class ControlItem {
     var window: NSWindow? {
         statusItem.button?.window
     }
+    
+    /// The control item's button frame in screen coordinates.
+    var buttonFrameInScreen: CGRect? {
+        guard let button = statusItem.button, let window = button.window else {
+            return nil
+        }
+        // The button frame is relative to its window
+        // Use the window frame origin plus button bounds for screen coordinates
+        let windowFrame = window.frame
+        let buttonBounds = button.bounds
+        // Convert button bounds to window coordinates
+        let buttonFrameInWindow = button.convert(buttonBounds, to: nil)
+        // Add window origin to get screen coordinates
+        return CGRect(
+            x: windowFrame.origin.x + buttonFrameInWindow.origin.x,
+            y: windowFrame.origin.y + buttonFrameInWindow.origin.y,
+            width: buttonFrameInWindow.width,
+            height: buttonFrameInWindow.height
+        )
+    }
 
+    private static let logger = Logger(category: "ControlItem")
+    
     /// The identifier of the control item's window.
     var windowID: CGWindowID? {
         guard let window else {
             return nil
         }
-        return CGWindowID(window.windowNumber)
+        let windowNumber = window.windowNumber
+        Self.logger.debug("windowNumber=\(windowNumber) for \(identifier.rawValue)")
+        guard windowNumber > 0 else {
+            return nil
+        }
+        // macOS 26+: windowNumber format changed - ID is in high 32 bits
+        // Try high bits first, then low bits for backwards compatibility
+        let highBits = CGWindowID(windowNumber >> 32)
+        let lowBits = CGWindowID(truncatingIfNeeded: windowNumber)
+        let resultID = highBits > 0 ? highBits : lowBits
+        Self.logger.debug("windowID=\(resultID) (high=\(highBits), low=\(lowBits)) for \(identifier.rawValue)")
+        return resultID > 0 ? resultID : nil
     }
 
     /// A Boolean value that indicates whether the control item serves as
@@ -394,12 +427,17 @@ final class ControlItem {
         else {
             return
         }
+        let modifiers = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
+        let showContextMenus = appState.settingsManager.advancedSettingsManager.showContextMenuOnRightClick
         switch event.type {
         case .leftMouseDown, .leftMouseUp:
-            if NSEvent.modifierFlags == .control {
+            if
+                modifiers == .control,
+                showContextMenus
+            {
                 statusItem.showMenu(createMenu(with: appState))
             } else if
-                NSEvent.modifierFlags == .option,
+                modifiers == .option,
                 appState.settingsManager.advancedSettingsManager.canToggleAlwaysHiddenSection
             {
                 if let alwaysHiddenSection = appState.menuBarManager.section(withName: .alwaysHidden) {
@@ -409,6 +447,9 @@ final class ControlItem {
                 section?.toggle()
             }
         case .rightMouseUp:
+            guard showContextMenus else {
+                return
+            }
             statusItem.showMenu(createMenu(with: appState))
         default:
             break
@@ -422,10 +463,10 @@ final class ControlItem {
             return hotkeySettingsManager.hotkey(withAction: action)
         }
 
-        let menu = NSMenu(title: "Ice")
+        let menu = NSMenu(title: NSLocalizedString("Ice", comment: "Menu title"))
 
         let settingsItem = NSMenuItem(
-            title: "Ice Settings…",
+            title: NSLocalizedString("Ice Settings…", comment: "Menu item"),
             action: #selector(AppDelegate.openSettingsWindow),
             keyEquivalent: ","
         )
@@ -435,7 +476,7 @@ final class ControlItem {
         menu.addItem(.separator())
 
         let searchItem = NSMenuItem(
-            title: "Search Menu Bar Items",
+            title: NSLocalizedString("Search Menu Bar Items", comment: "Menu item"),
             action: #selector(showSearchPanel),
             keyEquivalent: ""
         )
@@ -462,7 +503,15 @@ final class ControlItem {
                 continue
             }
             let item = NSMenuItem(
-                title: "\(section.isHidden ? "Show" : "Hide") the \(name.displayString) Section",
+                title: section.isHidden
+                    ? String(
+                        format: NSLocalizedString("Show the %@ Section", comment: "Menu item"),
+                        name.displayString
+                    )
+                    : String(
+                        format: NSLocalizedString("Hide the %@ Section", comment: "Menu item"),
+                        name.displayString
+                    ),
                 action: #selector(toggleMenuBarSection),
                 keyEquivalent: ""
             )
@@ -494,7 +543,7 @@ final class ControlItem {
         menu.addItem(.separator())
 
         let checkForUpdatesItem = NSMenuItem(
-            title: "Check for Updates…",
+            title: NSLocalizedString("Check for Updates…", comment: "Menu item"),
             action: #selector(checkForUpdates),
             keyEquivalent: ""
         )
@@ -504,7 +553,7 @@ final class ControlItem {
         menu.addItem(.separator())
 
         let quitItem = NSMenuItem(
-            title: "Quit Ice",
+            title: NSLocalizedString("Quit Ice", comment: "Menu item"),
             action: #selector(NSApp.terminate),
             keyEquivalent: "q"
         )