Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Sources/CodexBar/PreferencesMenuBarPane.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import SwiftUI

@MainActor
struct MenuBarPane: View {
private static let maxOverviewProviders = SettingsStore.mergedOverviewProviderLimit
private static var maxOverviewProviders: Int { SettingsStore.mergedOverviewProviderLimit }

@AppStorage("mergedOverviewProviderLimit") private var overviewProviderLimitSetting = 6

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Invalidate menus when overview limit changes

When this setting changes after the merged Overview menu has already been rendered, only UserDefaults.standard is updated. StatusItemController invalidates/rebuilds menu content via observation of settings.menuObservationToken, and that token never reads this new key, so menuNeedsUpdate can consider the existing menu fresh and keep showing the old number of Overview rows until an unrelated observed setting/store change or app restart. Please route the limit through SettingsStore/defaultsState and include it in menu observation, or otherwise invalidate the merged menu when the value changes.

Useful? React with 👍 / 👎.


@State private var isOverviewProviderPopoverPresented = false
@Bindable var settings: SettingsStore
Expand Down Expand Up @@ -75,6 +77,17 @@ struct MenuBarPane: View {

self.overviewProviderRow
.disabled(!self.settings.mergeIcons)

Stepper(
value: self.$overviewProviderLimitSetting,
in: 1 ... 12) {
SettingsRowLabel(
"Overview tab limit",
subtitle: "How many providers can show at once (default 6).")
Text("\(self.overviewProviderLimitSetting)")
.foregroundStyle(.secondary)
}
.disabled(!self.settings.mergeIcons)
} header: {
Text(L("section_combined_icon"))
}
Expand Down
17 changes: 16 additions & 1 deletion Sources/CodexBar/SettingsStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,22 @@ enum CodexAccountMenuProjectionRevalidationResult: Equatable {
@Observable
final class SettingsStore {
static let sharedDefaults = AppGroupSupport.sharedDefaults()
static let mergedOverviewProviderLimit = 6
/// User-configurable cap on how many providers render in the merged-icon
/// Overview tab. Used as a default-parameter value elsewhere in this file,
/// which Swift requires to be self-independent — hence `static var` (backed
/// by UserDefaults.standard, the same store `@AppStorage` targets) instead
/// of an instance property on `defaultsState`. Default matches the
/// original hardcoded value so existing users see no behavior change
/// unless they raise it.
static var mergedOverviewProviderLimit: Int {
get {
let stored = UserDefaults.standard.integer(forKey: "mergedOverviewProviderLimit")
return stored > 0 ? stored : 6
}
set {
UserDefaults.standard.set(max(1, newValue), forKey: "mergedOverviewProviderLimit")
}
}
static let productionCodexAccountReconciliationSnapshotCacheInterval: TimeInterval = 2
static let isRunningTests: Bool = {
let env = ProcessInfo.processInfo.environment
Expand Down
2 changes: 1 addition & 1 deletion Sources/CodexBar/StatusItemController+Menu.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import SwiftUI

extension StatusItemController {
static let menuCardBaseWidth: CGFloat = 310
private static let maxOverviewProviders = SettingsStore.mergedOverviewProviderLimit
private static var maxOverviewProviders: Int { SettingsStore.mergedOverviewProviderLimit }
static let overviewRowIdentifierPrefix = "overviewRow-"
static let persistentRefreshMenuItemID = "persistentRefreshAction"
private static let defaultMenuOpenRefreshDelay: Duration = .seconds(1.2)
Expand Down