Fix stable menu action rows

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Localizations: add Spanish and Catalan language packs and fill missing localization keys (#1041). Thanks @seifreed!
 
 ### Fixed
+- Menu: keep lower action rows stable when Refresh is highlighted or pressed (#1071). Thanks @MadanChaollaPark!
 - Linux CLI: avoid linking JetBrains provider parsing against `libxml2.so.2`, improving compatibility with newer distros that ship libxml2 2.15+ (#1046). Thanks @semsemyonoff!
 - Claude: remove the obsolete peak-hours indicator and setting now that Anthropic no longer applies peak-hour limits (#1023). Thanks @rohitjavvadi!
 - Antigravity: verify cloud model lists that report every quota as full against the user quota endpoint before showing remote OAuth usage (#1063). Thanks @devpras22!

Sources/CodexBar/StatusItemController+Actions.swift

@@ -32,6 +32,22 @@ extension StatusItemController: StatusItemMenuPersistentActionDelegate {
         }
     }
 
+    nonisolated func performPersistentSettingsAction() {
+        Task { @MainActor [weak self] in
+            guard let self else { return }
+            self.closeOpenMenusFromShortcutIfNeeded()
+            self.showSettingsGeneral()
+        }
+    }
+
+    nonisolated func performPersistentQuitAction() {
+        Task { @MainActor [weak self] in
+            guard let self else { return }
+            self.closeOpenMenusFromShortcutIfNeeded()
+            self.quit()
+        }
+    }
+
     nonisolated func performProviderNavigation(_ direction: StatusItemMenuProviderNavigationDirection) {
         Task { @MainActor [weak self] in
             self?.navigateProviderSwitcher(direction)

Sources/CodexBar/StatusItemController+Menu.swift

@@ -729,8 +729,12 @@ extension StatusItemController {
                     }
                     menu.addItem(item)
                 case let .action(title, action):
-                    if case .refresh = action {
-                        menu.addItem(self.makePersistentMenuActionItem(title: title, action: action, width: width))
+                    if self.usesPersistentMenuActionItem(for: action) {
+                        menu.addItem(self.makePersistentMenuActionItem(
+                            title: title,
+                            action: action,
+                            menu: menu,
+                            width: width))
                         continue
                     }
 
@@ -799,33 +803,31 @@ extension StatusItemController {
     private func makePersistentMenuActionItem(
         title: String,
         action: MenuDescriptor.MenuAction,
+        menu: NSMenu,
         width: CGFloat) -> NSMenuItem
     {
         let shortcut = self.shortcut(for: action)
         let row = PersistentMenuActionItemView(
             title: title,
-            systemImageName: action.systemImageName,
+            systemImageName: self.persistentMenuActionSystemImageName(for: action),
             shortcutText: shortcut.map { self.shortcutLabel(for: $0) },
             width: width,
-            onClick: { [weak self] in
-                self?.performPersistentMenuAction(action)
+            onClick: { [weak self, weak menu] in
+                self?.performPersistentMenuAction(action, in: menu)
             })
 
         let item = NSMenuItem(title: title, action: nil, keyEquivalent: shortcut?.key ?? "")
         item.keyEquivalentModifierMask = shortcut?.modifiers ?? NSEvent.ModifierFlags()
         item.isEnabled = true
         item.view = row
         item.toolTip = title
-        return item
-    }
-
-    private func performPersistentMenuAction(_ action: MenuDescriptor.MenuAction) {
-        switch action {
-        case .refresh:
-            self.refreshNow()
-        default:
-            break
+        if action != .refresh {
+            let (selector, represented) = self.selector(for: action)
+            item.action = selector
+            item.target = self
+            item.representedObject = represented
         }
+        return item
     }
 
     private func shortcutLabel(for shortcut: (key: String, modifiers: NSEvent.ModifierFlags)) -> String {

Sources/CodexBar/StatusItemController+MenuPresentation.swift

@@ -176,7 +176,7 @@ final class PersistentMenuActionItemView: NSView, MenuCardHighlighting {
     private let backgroundView = NSView()
     private let imageView = NSImageView()
     private let titleField: NSTextField
-    private let shortcutField: NSTextField?
+    private let shortcutField: NSTextField
     private let onClick: () -> Void
 
     override var intrinsicContentSize: NSSize {
@@ -199,7 +199,7 @@ final class PersistentMenuActionItemView: NSView, MenuCardHighlighting {
         onClick: @escaping () -> Void)
     {
         self.titleField = NSTextField(labelWithString: title)
-        self.shortcutField = shortcutText.map(NSTextField.init(labelWithString:))
+        self.shortcutField = NSTextField(labelWithString: shortcutText ?? "")
         self.onClick = onClick
         super.init(frame: NSRect(origin: .zero, size: NSSize(width: width, height: Self.rowHeight)))
         self.setupView(systemImageName: systemImageName)
@@ -225,7 +225,7 @@ final class PersistentMenuActionItemView: NSView, MenuCardHighlighting {
         let secondaryColor = highlighted ? NSColor.selectedMenuItemTextColor : NSColor.secondaryLabelColor
         self.backgroundView.isHidden = !highlighted
         self.titleField.textColor = primaryColor
-        self.shortcutField?.textColor = secondaryColor
+        self.shortcutField.textColor = secondaryColor
         self.imageView.contentTintColor = primaryColor
     }
 
@@ -250,6 +250,13 @@ final class PersistentMenuActionItemView: NSView, MenuCardHighlighting {
         self.titleField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         self.titleField.translatesAutoresizingMaskIntoConstraints = false
 
+        self.shortcutField.font = NSFont.menuFont(ofSize: NSFont.smallSystemFontSize)
+        self.shortcutField.alignment = .right
+        self.shortcutField.lineBreakMode = .byTruncatingTail
+        self.shortcutField.setContentHuggingPriority(.required, for: .horizontal)
+        self.shortcutField.setContentCompressionResistancePriority(.required, for: .horizontal)
+        self.shortcutField.translatesAutoresizingMaskIntoConstraints = false
+
         let spacer = NSView()
         spacer.translatesAutoresizingMaskIntoConstraints = false
         spacer.setContentHuggingPriority(.defaultLow, for: .horizontal)
@@ -262,11 +269,7 @@ final class PersistentMenuActionItemView: NSView, MenuCardHighlighting {
         stack.addArrangedSubview(self.imageView)
         stack.addArrangedSubview(self.titleField)
         stack.addArrangedSubview(spacer)
-        if let shortcutField {
-            shortcutField.font = NSFont.menuFont(ofSize: NSFont.smallSystemFontSize)
-            shortcutField.translatesAutoresizingMaskIntoConstraints = false
-            stack.addArrangedSubview(shortcutField)
-        }
+        stack.addArrangedSubview(self.shortcutField)
         self.addSubview(stack)
 
         NSLayoutConstraint.activate([
@@ -277,6 +280,7 @@ final class PersistentMenuActionItemView: NSView, MenuCardHighlighting {
 
             self.imageView.widthAnchor.constraint(equalToConstant: 18),
             self.imageView.heightAnchor.constraint(equalToConstant: 18),
+            self.shortcutField.widthAnchor.constraint(equalToConstant: 38),
 
             stack.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 12),
             stack.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -12),

Sources/CodexBar/StatusItemController+PersistentMenuActions.swift

@@ -0,0 +1,56 @@
+import AppKit
+
+extension StatusItemController {
+    func usesPersistentMenuActionItem(for action: MenuDescriptor.MenuAction) -> Bool {
+        switch action {
+        case .installUpdate, .refresh, .settings, .about, .quit:
+            true
+        default:
+            false
+        }
+    }
+
+    func persistentMenuActionSystemImageName(for action: MenuDescriptor.MenuAction) -> String? {
+        switch action {
+        case .installUpdate:
+            "arrow.down.circle"
+        case .refresh:
+            MenuDescriptor.MenuActionSystemImage.refresh.rawValue
+        case .settings:
+            MenuDescriptor.MenuActionSystemImage.settings.rawValue
+        case .about:
+            MenuDescriptor.MenuActionSystemImage.about.rawValue
+        case .quit:
+            MenuDescriptor.MenuActionSystemImage.quit.rawValue
+        default:
+            action.systemImageName
+        }
+    }
+
+    func performPersistentMenuAction(_ action: MenuDescriptor.MenuAction, in menu: NSMenu?) {
+        switch action {
+        case .refresh:
+            self.refreshNow()
+        case .installUpdate:
+            self.closeMenuForPersistentAction(menu)
+            self.installUpdate()
+        case .settings:
+            self.closeMenuForPersistentAction(menu)
+            self.showSettingsGeneral()
+        case .about:
+            self.closeMenuForPersistentAction(menu)
+            self.showSettingsAbout()
+        case .quit:
+            self.closeMenuForPersistentAction(menu)
+            self.quit()
+        default:
+            break
+        }
+    }
+
+    private func closeMenuForPersistentAction(_ menu: NSMenu?) {
+        guard let menu else { return }
+        menu.cancelTrackingWithoutAnimation()
+        self.forgetClosedMenu(menu)
+    }
+}

Sources/CodexBar/StatusItemMenu.swift

@@ -7,15 +7,24 @@ enum StatusItemMenuProviderNavigationDirection {
 
 protocol StatusItemMenuPersistentActionDelegate: AnyObject {
     func performPersistentRefreshAction()
+    func performPersistentSettingsAction()
+    func performPersistentQuitAction()
     func performProviderNavigation(_ direction: StatusItemMenuProviderNavigationDirection)
 }
 
 final class StatusItemMenu: NSMenu {
     weak var persistentActionDelegate: StatusItemMenuPersistentActionDelegate?
 
     override func performKeyEquivalent(with event: NSEvent) -> Bool {
-        if Self.isRefreshKeyEquivalent(event) {
-            self.persistentActionDelegate?.performPersistentRefreshAction()
+        if let action = Self.persistentAction(for: event) {
+            switch action {
+            case .refresh:
+                self.persistentActionDelegate?.performPersistentRefreshAction()
+            case .settings:
+                self.persistentActionDelegate?.performPersistentSettingsAction()
+            case .quit:
+                self.persistentActionDelegate?.performPersistentQuitAction()
+            }
             return true
         }
         if let direction = Self.providerNavigationDirection(for: event),
@@ -28,12 +37,28 @@ final class StatusItemMenu: NSMenu {
         return super.performKeyEquivalent(with: event)
     }
 
-    private nonisolated static func isRefreshKeyEquivalent(_ event: NSEvent) -> Bool {
-        guard event.type == .keyDown else { return false }
-        guard event.charactersIgnoringModifiers?.lowercased() == "r" else { return false }
+    private enum PersistentAction {
+        case refresh
+        case settings
+        case quit
+    }
+
+    private nonisolated static func persistentAction(for event: NSEvent) -> PersistentAction? {
+        guard event.type == .keyDown else { return nil }
 
         let relevantModifiers = event.modifierFlags.intersection([.command, .option, .control, .shift])
-        return relevantModifiers == .command
+        guard relevantModifiers == .command else { return nil }
+
+        switch event.charactersIgnoringModifiers?.lowercased() {
+        case "r":
+            return .refresh
+        case ",":
+            return .settings
+        case "q":
+            return .quit
+        default:
+            return nil
+        }
     }
 
     private nonisolated static func providerNavigationDirection(