CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
fix: 修复应用激活通知导致菜单面板关闭后重开
Bob4ca6039ae197
diff --git a/CodexBar/Controllers/MenuSurfaceDismissMonitor.swift b/CodexBar/Controllers/MenuSurfaceDismissMonitor.swiftindex 0f7650a..4240d17 100644--- a/CodexBar/Controllers/MenuSurfaceDismissMonitor.swift+++ b/CodexBar/Controllers/MenuSurfaceDismissMonitor.swift@@ -14,10 +14,13 @@ final class MenuSurfaceDismissMonitor {private var activeMenuSurfaceWindowResignKeyObserver: NSObjectProtocol?private var deferredWindowFocusTask: Task<Void, Never>?private var suppressActivationDismissTask: Task<Void, Never>?- private var suppressesActivationDismiss = falseprivate var onDismiss: (() -> Void)?private var onLogShortcut: (() -> Void)?+ private var suppressesActivationDismiss: Bool {+ suppressActivationDismissTask != nil+ }+init(isPresented: @escaping () -> Bool,windowProvider: @escaping () -> NSWindow?,@@ -74,12 +77,17 @@ final class MenuSurfaceDismissMonitor {object: nil,queue: .main) { [weak self] notification in+ // 激活通知可能早于状态按钮事件送达, 必须在进入 Task 前保存此次按下位置+ let mouseDownLocation = NSEvent.pressedMouseButtons & 0b11 != 0 ? NSEvent.mouseLocation : nillet activatedProcessIdentifier = (notification.userInfo?[NSWorkspace.applicationUserInfoKey] as? NSRunningApplication)?.processIdentifierTask { @MainActor [weak self, activatedProcessIdentifier] in- self?.dismissIfDifferentApplication(processIdentifier: activatedProcessIdentifier)+ self?.dismissIfDifferentApplication(+ processIdentifier: activatedProcessIdentifier,+ mouseDownLocation: mouseDownLocation+ )}}@@ -101,7 +109,6 @@ final class MenuSurfaceDismissMonitor {deferredWindowFocusTask = nilsuppressActivationDismissTask?.cancel()suppressActivationDismissTask = nil- suppressesActivationDismiss = falseremoveEventMonitor(&localEventMonitor)removeEventMonitor(&globalMouseEventMonitor)removeObserver(&appResignActiveObserver)@@ -153,7 +160,7 @@ final class MenuSurfaceDismissMonitor {onDismiss?()}- private func dismissIfDifferentApplication(processIdentifier: pid_t?) {+ private func dismissIfDifferentApplication(processIdentifier: pid_t?, mouseDownLocation: NSPoint?) {guard !suppressesActivationDismiss else {return}@@ -162,6 +169,11 @@ final class MenuSurfaceDismissMonitor {return}+ // 状态按钮的同一次点击由 mouseUp 切换, 不能被应用激活通知提前关闭+ if let mouseDownLocation, isPointInStatusButton(mouseDownLocation) {+ return+ }+dismiss()}@@ -229,14 +241,12 @@ final class MenuSurfaceDismissMonitor {// Command-Space 会切换系统搜索焦点// 需要短暂抑制失活关闭避免误关面板suppressActivationDismissTask?.cancel()- suppressesActivationDismiss = truesuppressActivationDismissTask = Task { @MainActor [weak self] intry? await Task.sleep(for: .milliseconds(Metrics.activationDismissSuppressionMilliseconds))guard let self, !Task.isCancelled else {return}- suppressesActivationDismiss = falsesuppressActivationDismissTask = nil}}