CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
fix: 让热力图详情跟随区域位置
Bob8320aadf3808
diff --git a/CLAUDE.md b/CLAUDE.mdindex 126621e..66fdb2e 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -325,6 +325,7 @@ Hook 子进程按天写入 `~/Library/Application Support/CodexBar/HookEvents/ev- 不要再用 `@_optimize(none)` 规避这个漏绘:它当年在通知子面板管用只是因为逼着 body 重算时判定那些行变过,与优化等级无关,换个写法就失效;`SidePanelSupport` 里剩下那一处标注规避的是编译器崩溃,与此无关- 主面板的账户、任务中心、额度、Token 用量和底部状态由 `MainPanelSettings.layout` 统一保存顺序与显隐,模型始终保留至少一个区域;Hook 关闭时 `StatusItemController` 调用 `updateHookEnabled(_:)` 持久化关闭任务中心,任务中心原本是唯一可见区域时同步开启账户;设置面板只禁用任务中心开关,不能连带禁用拖拽手柄- 主面板布局排序由手柄上的自定义 `DragGesture` 驱动,悬浮副本跟手移动,其他行按预览顺序实时让位,松手后才通过 `setSectionOrder(_:)` 保存最终顺序;不要改回只在落点命中后换位的 `.draggable` 和 `.dropDestination`+- 热力图详情面板跟随包含标题和方格矩阵的完整热力图区域定位,优先让两者顶边对齐;详情面板过高时通过 `SidePanelSupport.anchoredPosition` 上移到与主面板底边对齐,不能恢复为固定贴住主面板底边- `SettingsWindowController` 持有窗口组唯一的 `UndoManager`,设置主窗口和四个可聚焦子面板必须共享这一撤销栈,保证焦点切换后 `⌘Z` 与 `⌘⇧Z` 仍然有效;Hook 自动联动不注册为用户操作- 设置窗口高度跟随当前 tab 的完整内容,只在内容超过屏幕可见高度时允许滚动;首次构造时 SwiftUI 可能早于 `HostingWindowController.window` 赋值上报高度,`SettingsWindowController` 必须缓存最近测量并在窗口就绪后应用,不能用初始高度或延迟掩盖- 设置窗口(通用/高级/关于三页)和日志窗口复用 `HostingWindowController` 的行为,可以成为 key window,但不应成为 main windowdiff --git a/CodexBar/Controllers/HeatmapDetailPanelController.swift b/CodexBar/Controllers/HeatmapDetailPanelController.swiftindex 33be624..5960b69 100644--- a/CodexBar/Controllers/HeatmapDetailPanelController.swift+++ b/CodexBar/Controllers/HeatmapDetailPanelController.swift@@ -116,9 +116,7 @@ final class HeatmapDetailPanelController {for: panelSize,relativeTo: menuSurfaceWindow,contentView: contentView,- anchorScreenFrame: context.anchorScreenFrame,- heatmapScreenFrame: context.heatmapScreenFrame,- showsWorkflow: context.showsWorkflow,+ alignmentScreenFrame: context.alignmentScreenFrame,preferredSide: context.preferredSide)let request = PanelRequest(context: context, position: position)@@ -307,47 +305,26 @@ final class HeatmapDetailPanelController {for panelSize: CGSize,relativeTo menuSurfaceWindow: NSWindow,contentView: NSView?,- anchorScreenFrame: CGRect?,- heatmapScreenFrame: CGRect?,- showsWorkflow: Bool,+ alignmentScreenFrame: CGRect?,preferredSide: UsageHeatmapDetailSide) -> SidePanelPosition {let menuSurfaceFrame = SidePanelSupport.contentScreenFrame(for: contentView, in: menuSurfaceWindow) ?? menuSurfaceWindow.frame- let visibleFrame = (menuSurfaceWindow.screen ?? NSScreen.main)?.visibleFrame ?? menuSurfaceFrame+ let screen = menuSurfaceWindow.screen ?? NSScreen.main+ let validatedAlignmentScreenFrame = SidePanelSupport.validatedAlignmentScreenFrame(+ alignmentScreenFrame,+ menuSurfaceFrame: menuSurfaceFrame+ )- return SidePanelSupport.position(+ return SidePanelSupport.anchoredPosition(panelSize: panelSize,menuSurfaceFrame: menuSurfaceFrame,- visibleFrame: visibleFrame,- preferredSide: preferredSide,- proposedY: proposedY(- for: panelSize,- menuSurfaceFrame: menuSurfaceFrame,- anchorScreenFrame: anchorScreenFrame,- heatmapScreenFrame: heatmapScreenFrame,- showsWorkflow: showsWorkflow- )+ visibleFrame: screen?.visibleFrame ?? menuSurfaceFrame,+ screenFrame: screen?.frame,+ alignmentScreenFrame: validatedAlignmentScreenFrame,+ preferredSide: preferredSide)}- private func proposedY(- for panelSize: CGSize,- menuSurfaceFrame: CGRect,- anchorScreenFrame: CGRect?,- heatmapScreenFrame: CGRect?,- showsWorkflow: Bool- ) -> CGFloat {- if showsWorkflow {- menuSurfaceFrame.minY- } else if let heatmapScreenFrame {- heatmapScreenFrame.maxY - panelSize.height- } else if let anchorScreenFrame {- anchorScreenFrame.maxY - panelSize.height- } else {- menuSurfaceFrame.midY - panelSize.height / 2- }- }-private func cancelHideTask() {hideTask?.cancel()hideTask = nildiff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swiftindex bfb665c..7edc380 100644--- a/CodexBar/Views/Menu/UsageHeatmap.swift+++ b/CodexBar/Views/Menu/UsageHeatmap.swift@@ -5,8 +5,7 @@ import SwiftUInonisolated struct UsageHeatmapHoverContext: Equatable {let day: UsageHeatmapDaylet showsWorkflow: Bool- let anchorScreenFrame: CGRect?- let heatmapScreenFrame: CGRect?+ let alignmentScreenFrame: CGRect?let preferredSide: UsageHeatmapDetailSidelet peakTokens: Int}@@ -34,7 +33,7 @@ struct UsageSummaryView: View {private let days: [UsageHeatmapDay?]private let peakTokens: Int@State private var hoverSelection: UsageHeatmapSelection?- @State private var heatmapGridScreenFrame: CGRect?+ @State private var heatmapScreenFrame: CGRect?init(usage: CodexUsageSnapshot,@@ -68,7 +67,7 @@ struct UsageSummaryView: View {selection: $hoverSelection,peakTokens: peakTokens,onScreenFrameChange: { frame in- heatmapGridScreenFrame = frame+ heatmapScreenFrame = frame})}@@ -179,32 +178,13 @@ struct UsageSummaryView: View {UsageHeatmapHoverContext(day: $0.day,showsWorkflow: showsWorkflow,- anchorScreenFrame: hoveredSquareScreenFrame(for: $0),- heatmapScreenFrame: heatmapGridScreenFrame,+ alignmentScreenFrame: heatmapScreenFrame,preferredSide: UsageHeatmap.Metrics.preferredDetailSide(for: $0.column),peakTokens: peakTokens)}}- private func hoveredSquareScreenFrame(for selection: UsageHeatmapSelection) -> CGRect? {- guard let heatmapGridScreenFrame else {- return nil- }-- let x = heatmapGridScreenFrame.minX + CGFloat(selection.column) * UsageHeatmap.Metrics.squarePitch- let y = heatmapGridScreenFrame.maxY- - CGFloat(selection.row) * UsageHeatmap.Metrics.squarePitch- - UsageHeatmap.Metrics.squareSize-- return CGRect(- x: x,- y: y,- width: UsageHeatmap.Metrics.squareSize,- height: UsageHeatmap.Metrics.squareSize- )- }-private func refreshHoveredDay(from days: [UsageHeatmapDay?]) {guard let hoverSelection else {return@@ -262,6 +242,9 @@ struct UsageHeatmap: View {var body: some View {heatmapGrid.frame(height: Metrics.height)+ .background {+ ScreenFrameReader(onChange: onScreenFrameChange)+ }.onDisappear {cancelHoverClearTask()onScreenFrameChange(nil)@@ -315,9 +298,6 @@ struct UsageHeatmap: View {scheduleDeactivate()}}- .background {- ScreenFrameReader(onChange: onScreenFrameChange)- }}.frame(maxWidth: .infinity, alignment: .leading)}diff --git a/Config/Version.xcconfig b/Config/Version.xcconfigindex 7909287..7399f3e 100644--- a/Config/Version.xcconfig+++ b/Config/Version.xcconfig@@ -1,2 +1,2 @@-MARKETING_VERSION = 3.6.6-CURRENT_PROJECT_VERSION = 73+MARKETING_VERSION = 3.6.7+CURRENT_PROJECT_VERSION = 74diff --git a/Docs/DeveloperGuide/ui-and-lifecycle.md b/Docs/DeveloperGuide/ui-and-lifecycle.mdindex 1ca55b4..5637ee4 100644--- a/Docs/DeveloperGuide/ui-and-lifecycle.md+++ b/Docs/DeveloperGuide/ui-and-lifecycle.md@@ -188,6 +188,8 @@ fallback panel 在展示前根据 SwiftUI fitting size 和目标屏幕可见区hover 类型的热力图面板在打开其他面板前可以渐隐,点击类型的面板通常立即关闭旧面板。这是为了避免同一屏幕位置出现两个反向滑动动画叠加。+热力图详情面板以包含标题、日期范围和方格矩阵的完整热力图区域作为垂直锚点,因此主面板区域重排后仍优先保持两者顶边对齐。如果详情面板从该位置向下会超过主面板底边,则定位逻辑将它整体上移到与主面板底边对齐。+相关控制器包括:- [`HeatmapDetailPanelController.swift`](../../CodexBar/Controllers/HeatmapDetailPanelController.swift)@@ -316,6 +318,7 @@ app-server 状态默认每 60 秒刷新。面板打开时会安排约 160 ms 的- 左键打开主面板,右键和 Control 点击打开上下文菜单- 点击主面板外部正确关闭,点击侧边面板不误关闭- 热力图、Reset Credits 和活动中心保持互斥+- Token 用量区域处于不同排序位置时,热力图详情优先与完整热力图区域顶边对齐;详情高度放不下时与主面板底边对齐- 全局快捷键在状态栏锚点有效和无效场景都能打开面板- 从通知点击激活 App 并打开面板- 设置窗口首次打开、关闭和再次打开时焦点正确diff --git a/Docs/en/DeveloperGuide/ui-and-lifecycle.md b/Docs/en/DeveloperGuide/ui-and-lifecycle.mdindex 53b7ef6..bca8e28 100644--- a/Docs/en/DeveloperGuide/ui-and-lifecycle.md+++ b/Docs/en/DeveloperGuide/ui-and-lifecycle.md@@ -188,6 +188,8 @@ This scales better than encoding every pairwise close relationship. Adding a fouThe hover-driven heatmap panel may fade before another panel opens; click-driven panels normally close the old panel immediately. This avoids two opposing slide animations at the same screen location.+The heatmap detail panel uses the complete heatmap area, including its heading, date range, and square grid, as its vertical anchor. Reordering main-panel sections therefore still keeps their top edges aligned whenever possible. If the detail panel would extend below the main panel from that position, placement shifts it upward until their bottom edges align.+Related controllers include:- [`HeatmapDetailPanelController.swift`](../../../CodexBar/Controllers/HeatmapDetailPanelController.swift)@@ -316,6 +318,7 @@ Release scripts require Developer ID, signing, and notarization credentials and- Left-click opens the main panel; right-click and Control-click open the context menu- Clicking outside the main panel dismisses it; clicking a side panel does not- Heatmap, Reset Credits, and Task Center panels remain mutually exclusive+- With Token Usage at different positions in the main-panel order, heatmap details align to the complete heatmap area's top edge when possible and fall back to the main panel's bottom edge when the detail height does not fit- The global shortcut opens the panel with both valid and invalid status-bar anchors- Clicking a notification activates the app and opens the panel- Focus is correct when opening Settings for the first time, closing it, and reopening itdiff --git a/appcast.xml b/appcast.xmlindex dd27e92..e2eb64f 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 3.6.7</title>+ <sparkle:version>74</sparkle:version>+ <sparkle:shortVersionString>3.6.7</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#3.6.7</sparkle:releaseNotesLink>+ <pubDate>Sun, 23 Aug 2026 20:22:04 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v3.6.7.dmg" sparkle:edSignature="63z8CpeoY/kizNamG2ZYmMFKUtrR3+KVArRWvIET5vduWsBLOtr3ohvpFbVh/LURKVvhwsHVt1IwG3PcYG9lAA==" length="7163785" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 3.6.6</title><sparkle:version>73</sparkle:version>