Skip to content

Commit b115568

Browse files
committed
fix: unify remaining enabledProviders calls to display list in UI path
Align status indicator, unified icon primary provider, resolved menu provider default, delayed refresh retry, and menu card width/height calculations to use enabledProvidersForDisplay() so the entire UI pipeline consistently reflects all user-enabled providers regardless of credential availability.
1 parent 523c262 commit b115568

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Sources/CodexBar/StatusItemController+Animation.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ extension StatusItemController {
278278
let tilt: CGFloat = style == .combined ? 0 : self.tiltAmount(for: primaryProvider) * .pi / 28
279279

280280
let statusIndicator: ProviderStatusIndicator = {
281-
for provider in self.store.enabledProviders() {
281+
for provider in self.store.enabledProvidersForDisplay() {
282282
let indicator = self.store.statusIndicator(for: provider)
283283
if indicator.hasIssue { return indicator }
284284
}
@@ -499,7 +499,7 @@ extension StatusItemController {
499499
return provider
500500
}
501501
}
502-
if let enabled = self.store.enabledProviders().first {
502+
if let enabled = self.store.enabledProvidersForDisplay().first {
503503
return enabled
504504
}
505505
return .codex

Sources/CodexBar/StatusItemController+Menu.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ extension StatusItemController {
618618
}
619619

620620
private func resolvedMenuProvider(enabledProviders: [UsageProvider]? = nil) -> UsageProvider? {
621-
let enabled = enabledProviders ?? self.store.enabledProviders()
621+
let enabled = enabledProviders ?? self.store.enabledProvidersForDisplay()
622622
if enabled.isEmpty { return .codex }
623623
if let selected = self.selectedMenuProvider, enabled.contains(selected) {
624624
return selected
@@ -735,7 +735,7 @@ extension StatusItemController {
735735
}
736736

737737
private func delayedRefreshRetryProviders(for menu: NSMenu) -> [UsageProvider] {
738-
let enabledProviders = self.store.enabledProviders()
738+
let enabledProviders = self.store.enabledProvidersForDisplay()
739739
guard !enabledProviders.isEmpty else { return [] }
740740
let includesOverview = self.includesOverviewTab(enabledProviders: enabledProviders)
741741

@@ -766,7 +766,7 @@ extension StatusItemController {
766766
}
767767
for item in cardItems {
768768
guard let view = item.view else { continue }
769-
let width = self.menuCardWidth(for: self.store.enabledProviders(), menu: menu)
769+
let width = self.menuCardWidth(for: self.store.enabledProvidersForDisplay(), menu: menu)
770770
let height = self.menuCardHeight(for: view, width: width)
771771
view.frame = NSRect(
772772
origin: .zero,
@@ -1343,7 +1343,7 @@ extension StatusItemController {
13431343
}
13441344

13451345
private func refreshHostedSubviewHeights(in menu: NSMenu) {
1346-
let enabledProviders = self.store.enabledProviders()
1346+
let enabledProviders = self.store.enabledProvidersForDisplay()
13471347
let width = self.menuCardWidth(for: enabledProviders, menu: menu)
13481348

13491349
for item in menu.items {

0 commit comments

Comments
 (0)