Skip to content

CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息

fix: 修复 Popover 交互并更新演示资源

Bob364aa0e3bc9c
diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxproj
index 01d9719..b310826 100644
--- a/CodexBar.xcodeproj/project.pbxproj
+++ b/CodexBar.xcodeproj/project.pbxproj
@@ -275,7 +275,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 21;
+ CURRENT_PROJECT_VERSION = 22;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
ENABLE_APP_SANDBOX = NO;
@@ -290,7 +290,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 2.4.5;
+ MARKETING_VERSION = 2.4.6;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
@@ -312,7 +312,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 21;
+ CURRENT_PROJECT_VERSION = 22;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
ENABLE_APP_SANDBOX = NO;
@@ -327,7 +327,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 2.4.5;
+ MARKETING_VERSION = 2.4.6;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/CodexBar/Controllers/HeatmapDetailPanelController.swift b/CodexBar/Controllers/HeatmapDetailPanelController.swift
index d0dbf52..10a3723 100644
--- a/CodexBar/Controllers/HeatmapDetailPanelController.swift
+++ b/CodexBar/Controllers/HeatmapDetailPanelController.swift
@@ -19,8 +19,7 @@ final class HeatmapDetailPanelController {
private var hideTask: Task<Void, Never>?
private var currentSide = UsageHeatmapDetailSide.left
private var visibilityGeneration = 0
- private var isSwitchingSide = false
- private var isDrawerHiding = false
+ private var drawerTransition = DrawerTransition.idle
private var pendingSideSwitchRequest: PanelRequest?
private weak var popoverWindow: NSWindow?
@@ -45,7 +44,7 @@ final class HeatmapDetailPanelController {
func hide(immediate: Bool = false, delayed: Bool = true) {
cancelHideTask()
visibilityGeneration += 1
- isSwitchingSide = false
+ drawerTransition = .idle
pendingSideSwitchRequest = nil
guard let panel, panel.isVisible else {
@@ -54,7 +53,7 @@ final class HeatmapDetailPanelController {
guard !immediate else {
resetDrawerVisualState(for: panel)
- isDrawerHiding = false
+ drawerTransition = .idle
orderOut(panel)
return
}
@@ -74,7 +73,7 @@ final class HeatmapDetailPanelController {
return
}
- self.isDrawerHiding = true
+ self.drawerTransition = .exiting
let hidden = self.drawerHiddenTranslation(for: side, panelWidth: panel.frame.width)
self.animateContentTranslation(
to: hidden,
@@ -89,7 +88,7 @@ final class HeatmapDetailPanelController {
self.orderOut(panel)
self.setContentTranslation(0)
- self.isDrawerHiding = false
+ self.drawerTransition = .idle
self.hideTask = nil
}
}
@@ -126,37 +125,53 @@ final class HeatmapDetailPanelController {
restorePopoverKeyWindow(popoverWindow)
}
- if wasVisible && isSwitchingSide {
+ if wasVisible {
+ updateVisiblePanel(request, on: panel)
+ return
+ }
+
+ visibilityGeneration += 1
+ apply(request, to: panel)
+ showPanelWithDrawerAnimation(panel, relativeTo: popoverWindow)
+ }
+
+ private func updateVisiblePanel(_ request: PanelRequest, on panel: NSPanel) {
+ if drawerTransition == .switchingSide {
pendingSideSwitchRequest = request
return
}
- if wasVisible && currentSide != position.side {
+ if currentSide != request.position.side {
beginSideSwitch(on: panel, from: currentSide, to: request)
return
}
- visibilityGeneration += 1
- let resumesDrawerHide = wasVisible && isDrawerHiding
+ let activeTransition = drawerTransition
+ if activeTransition != .entering {
+ visibilityGeneration += 1
+ }
apply(request, to: panel)
- if resumesDrawerHide {
- isDrawerHiding = false
- animateContentTranslation(to: 0, duration: Metrics.drawerEnterDuration, timing: .easeOut)
+ switch activeTransition {
+ case .entering:
return
- }
-
- guard !wasVisible else {
+ case .exiting:
+ drawerTransition = .idle
+ animateContentTranslation(to: 0, duration: Metrics.drawerEnterDuration, timing: .easeOut)
+ case .idle, .switchingSide:
+ drawerTransition = .idle
resetDrawerVisualState(for: panel)
- return
}
-
+ }
+
+ private func showPanelWithDrawerAnimation(_ panel: NSPanel, relativeTo popoverWindow: NSWindow) {
let generation = visibilityGeneration
- let hidden = drawerHiddenTranslation(for: position.side, panelWidth: panelSize.width)
+ let hidden = drawerHiddenTranslation(for: currentSide, panelWidth: panel.frame.width)
setContentTranslation(hidden)
panel.alphaValue = 0
attach(panel, to: popoverWindow)
panel.order(.above, relativeTo: popoverWindow.windowNumber)
+ drawerTransition = .entering
animateContentTranslationAfterInitialLayout(
from: hidden,
panel: panel,
@@ -171,8 +186,7 @@ final class HeatmapDetailPanelController {
) {
visibilityGeneration += 1
let generation = visibilityGeneration
- isSwitchingSide = true
- isDrawerHiding = false
+ drawerTransition = .switchingSide
pendingSideSwitchRequest = nil
let hidden = drawerHiddenTranslation(for: sourceSide, panelWidth: panel.frame.width)
@@ -184,7 +198,7 @@ final class HeatmapDetailPanelController {
Task { @MainActor [weak self] in
guard let self,
generation == self.visibilityGeneration,
- self.isSwitchingSide,
+ self.drawerTransition == .switchingSide,
panel.isVisible else {
return
}
@@ -218,8 +232,7 @@ final class HeatmapDetailPanelController {
return
}
- self.isSwitchingSide = false
- self.isDrawerHiding = false
+ self.drawerTransition = .idle
self.setContentTranslation(0)
self.handlePendingSideSwitchRequest(on: panel)
}
@@ -541,7 +554,17 @@ final class HeatmapDetailPanelController {
to: 0,
duration: Metrics.drawerEnterDuration,
timing: .easeOut
- )
+ ) {
+ Task { @MainActor [weak self] in
+ guard let self,
+ generation == self.visibilityGeneration else {
+ return
+ }
+
+ self.drawerTransition = .idle
+ self.setContentTranslation(0)
+ }
+ }
}
}
@@ -583,6 +606,13 @@ final class HeatmapDetailPanelController {
static let drawerTransformAnimationKey = "CodexBar.heatmapDetailDrawerTransform"
}
+ private enum DrawerTransition {
+ case idle
+ case entering
+ case exiting
+ case switchingSide
+ }
+
private struct PanelPosition {
let frame: NSRect
let side: UsageHeatmapDetailSide
diff --git a/CodexBar/Controllers/PopoverDismissMonitor.swift b/CodexBar/Controllers/PopoverDismissMonitor.swift
index e107b28..7eda210 100644
--- a/CodexBar/Controllers/PopoverDismissMonitor.swift
+++ b/CodexBar/Controllers/PopoverDismissMonitor.swift
@@ -41,7 +41,10 @@ final class PopoverDismissMonitor {
}
globalMouseEventMonitor = NSEvent.addGlobalMonitorForEvents(matching: Metrics.mouseDismissEventMask) { [weak self] _ in
- self?.scheduleDismiss()
+ let screenPoint = NSEvent.mouseLocation
+ Task { @MainActor [weak self, screenPoint] in
+ self?.dismissIfNeeded(at: screenPoint)
+ }
}
appResignActiveObserver = NotificationCenter.default.addObserver(
@@ -220,7 +223,15 @@ final class PopoverDismissMonitor {
return
}
- if isEventInsidePopover(event) || isEventInsideStatusButton(event) {
+ dismissIfNeeded(at: screenPoint(for: event))
+ }
+
+ private func dismissIfNeeded(at screenPoint: NSPoint) {
+ guard popover.isShown else {
+ return
+ }
+
+ if isScreenPointInsidePopover(screenPoint) || isScreenPointInsideStatusButton(screenPoint) {
return
}
@@ -267,26 +278,27 @@ final class PopoverDismissMonitor {
}
}
- private func isEventInsidePopover(_ event: NSEvent) -> Bool {
- guard let contentView = popover.contentViewController?.view,
- event.window == contentView.window else {
+ private func screenPoint(for event: NSEvent) -> NSPoint {
+ event.window?.convertPoint(toScreen: event.locationInWindow) ?? NSEvent.mouseLocation
+ }
+
+ private func isScreenPointInsidePopover(_ screenPoint: NSPoint) -> Bool {
+ guard let popoverWindow = popover.contentViewController?.view.window else {
return false
}
- let point = contentView.convert(event.locationInWindow, from: nil)
- return contentView.bounds.contains(point)
+ return popoverWindow.frame.contains(screenPoint)
}
- private func isEventInsideStatusButton(_ event: NSEvent) -> Bool {
+ private func isScreenPointInsideStatusButton(_ screenPoint: NSPoint) -> Bool {
guard let button = statusButtonProvider(),
let buttonWindow = button.window else {
return false
}
- let eventScreenPoint = event.window?.convertPoint(toScreen: event.locationInWindow) ?? NSEvent.mouseLocation
let buttonRectInWindow = button.convert(button.bounds, to: nil)
let buttonScreenRect = buttonWindow.convertToScreen(buttonRectInWindow)
- return buttonScreenRect.contains(eventScreenPoint)
+ return buttonScreenRect.contains(screenPoint)
}
private enum Metrics {
diff --git a/Images/record.gif b/Images/record.gif
new file mode 100644
index 0000000..5c6a9bf
Binary files /dev/null and b/Images/record.gif differ
diff --git a/Images/screenshot.png b/Images/screenshot.png
deleted file mode 100644
index bff5f35..0000000
Binary files a/Images/screenshot.png and /dev/null differ
diff --git a/README.md b/README.md
index 66fd746..36d0df0 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
CodexBar 是一个轻量级 macOS 菜单栏应用。它直接连接本机 Codex 的 app-server,定期读取额度信息;也可以通过 Codex Hook 记录本机工作流数据,让你不用打开终端就能随时知道: 还剩多少额度、什么时候重置、最近用了多少 token,以及今天的会话、对话轮次、工具调用等情况。
<p align="center">
- <img src="Images/screenshot.png" alt="CodexBar" width="532">
+ <img src="Images/record.gif" width="532">
</p>
## 特性
diff --git a/appcast.xml b/appcast.xml
index 323b9ba..861f649 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -7,6 +7,15 @@
<link>https://codexbar.zabrian.app/appcast.xml</link>
<description>CodexBar appcast feed</description>
<language>zh-CN</language>
+ <item>
+ <title>CodexBar.app 2.4.6</title>
+ <sparkle:version>22</sparkle:version>
+ <sparkle:shortVersionString>2.4.6</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.4.6</sparkle:releaseNotesLink>
+ <pubDate>Tue, 23 Jun 2026 13:32:15 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.4.6.dmg" sparkle:edSignature="2PmJ48M8JsOyyC39M815vZf8+/AgzVC8cNqjhfNl0XBc8NzoUPUtsYiVMGTrjYr3Lw3JphP5haHcLsxshVetDQ==" length="3025786" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 2.4.5</title>
<sparkle:version>21</sparkle:version>