Skip to content

feat: add configurable usage display order setting #4126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m11y wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: add configurable usage display order setting #4126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09e6cad
feat: add configurable usage display order setting
m11y Jun 12, 2026
4135285
fix: add usageDisplayOrder to Settings TypeScript interface
m11y Jun 12, 2026
ea2f805
fix: persist usageDisplayOrder in backend and apply to UsageFooter
m11y Jun 17, 2026
e2a10cf
feat: apply usageDisplayOrder to tray menu and subscription badges
m11y Jun 17, 2026
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
27 changes: 27 additions & 0 deletions src-tauri/src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,9 @@ pub struct AppSettings {
pub common_config_confirmed: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub language: Option<String>,
/// 用量显示顺序："remaining-first"（默认）或 "used-first"
#[serde(default, skip_serializing_if = "Option::is_none")]
pub usage_display_order: Option<String>,

// ===== 主页面显示的应用 =====
#[serde(default, skip_serializing_if = "Option::is_none")]
Expand Down Expand Up @@ -510,6 +513,7 @@ impl Default for AppSettings {
first_run_notice_confirmed: None,
common_config_confirmed: None,
language: None,
usage_display_order: None,
visible_apps: None,
claude_config_dir: None,
codex_config_dir: None,
Expand Down Expand Up @@ -597,6 +601,13 @@ impl AppSettings {
.filter(|s| matches!(*s, "en" | "zh" | "zh-TW" | "ja"))
.map(|s| s.to_string());

self.usage_display_order = self
.usage_display_order
.as_ref()
.map(|s| s.trim())
.filter(|s| matches!(*s, "remaining-first" | "used-first"))
.map(|s| s.to_string());

if let Some(sync) = &mut self.webdav_sync {
sync.normalize();
if sync.is_empty() {
Expand Down Expand Up @@ -920,6 +931,22 @@ pub fn unify_codex_session_history() -> bool {
.unify_codex_session_history
}

/// 用量是否采用“剩余优先”显示。
///
/// 设备级 UI 偏好：`None` / `"remaining-first"` 视为剩余优先（默认），
/// `"used-first"` 为已用优先。与前端 `usageDisplayOrder` 默认值保持一致。
pub fn usage_display_remaining_first() -> bool {
settings_store()
.read()
.unwrap_or_else(|e| {
log::warn!("设置锁已毒化，使用恢复值: {e}");
e.into_inner()
})
.usage_display_order
.as_deref()
!= Some("used-first")
}

// ===== 当前供应商管理函数 =====

/// 获取指定应用类型的当前供应商 ID（从本地 settings 读取）
Expand Down
Loading