diff --git a/src-tauri/src/badge.rs b/src-tauri/src/badge.rs index 7a57acb..6775718 100644 --- a/src-tauri/src/badge.rs +++ b/src-tauri/src/badge.rs @@ -1,4 +1,4 @@ -//! Renders the "ahead"/"behind" counts as a small dual-badge icon and applies it as the +//! Renders the combined repository attention count as a taskbar badge and applies it as the //! Windows taskbar overlay. Windows has no native numeric taskbar badge (unlike //! macOS/Linux, which support `Window::set_badge_count`), so the numbers have to be drawn //! into a plain RGBA icon ourselves and set via `Window::set_overlay_icon`. @@ -27,28 +27,42 @@ fn glyph_rows(ch: char) -> [&'static str; GLYPH_HEIGHT] { } } -// Match the sync-stats pills in the status bar (see `.sync-stats strong` in app.css): -// ahead is orange (#e0a040), behind is blue (#7aacff). Border shades are a darkened tint -// of the same color so the circle reads clearly against any taskbar background. -const AHEAD_FILL: [u8; 4] = [224, 160, 64, 255]; -const AHEAD_BORDER: [u8; 4] = [176, 118, 40, 255]; -const BEHIND_FILL: [u8; 4] = [122, 172, 255, 255]; -const BEHIND_BORDER: [u8; 4] = [78, 128, 216, 255]; +const BADGE_FILL: [u8; 4] = [224, 160, 64, 255]; +const BADGE_BORDER: [u8; 4] = [176, 118, 40, 255]; +const TEXT_FILL: [u8; 4] = [255, 255, 255, 255]; +const TEXT_SHADOW: [u8; 4] = [10, 12, 24, 190]; +const CIRCLE_BORDER_WIDTH: f32 = 3.0; -/// Caps the displayed text at two characters ("9+") so it always fits legibly in a badge. +/// Caps the displayed text at three characters ("99+") so it always fits legibly. fn cap_text(count: u32) -> String { - if count > 9 { "9+".to_string() } else { count.to_string() } + if count > 99 { + "99+".to_string() + } else { + count.to_string() + } } /// Draws a filled circle (with a slightly darker rim) centered at `(cx, cy)`. -fn draw_circle(rgba: &mut [u8], size: usize, cx: f32, cy: f32, radius: f32, fill: [u8; 4], border: [u8; 4]) { +fn draw_circle( + rgba: &mut [u8], + size: usize, + cx: f32, + cy: f32, + radius: f32, + fill: [u8; 4], + border: [u8; 4], +) { for y in 0..size { for x in 0..size { let dx = x as f32 + 0.5 - cx; let dy = y as f32 + 0.5 - cy; let dist = (dx * dx + dy * dy).sqrt(); if dist <= radius { - let color = if dist >= radius - 1.5 { border } else { fill }; + let color = if dist >= radius - CIRCLE_BORDER_WIDTH { + border + } else { + fill + }; let idx = (y * size + x) * 4; rgba[idx..idx + 4].copy_from_slice(&color); } @@ -56,15 +70,23 @@ fn draw_circle(rgba: &mut [u8], size: usize, cx: f32, cy: f32, radius: f32, fill } } -/// Draws white `text` centered at `(cx, cy)`, scaling each font pixel up by `scale`. -fn draw_text(rgba: &mut [u8], size: usize, text: &str, cx: f32, cy: f32, scale: usize) { +fn draw_text_layer( + rgba: &mut [u8], + size: usize, + text: &str, + cx: f32, + cy: f32, + scale: usize, + offset: (isize, isize), + color: [u8; 4], +) { let glyphs: Vec<[&'static str; GLYPH_HEIGHT]> = text.chars().map(glyph_rows).collect(); let glyph_px_w = GLYPH_WIDTH * scale; let glyph_px_h = GLYPH_HEIGHT * scale; let gap = scale.max(1); let total_w = glyphs.len() * glyph_px_w + gap * glyphs.len().saturating_sub(1); - let start_x = (cx - total_w as f32 / 2.0).round() as isize; - let start_y = (cy - glyph_px_h as f32 / 2.0).round() as isize; + let start_x = (cx - total_w as f32 / 2.0).round() as isize + offset.0; + let start_y = (cy - glyph_px_h as f32 / 2.0).round() as isize + offset.1; for (gi, rows) in glyphs.iter().enumerate() { let glyph_x = start_x + (gi * (glyph_px_w + gap)) as isize; @@ -79,7 +101,7 @@ fn draw_text(rgba: &mut [u8], size: usize, text: &str, cx: f32, cy: f32, scale: let y = start_y + (gy * scale + py) as isize; if x >= 0 && y >= 0 && (x as usize) < size && (y as usize) < size { let idx = (y as usize * size + x as usize) * 4; - rgba[idx..idx + 4].copy_from_slice(&[255, 255, 255, 255]); + rgba[idx..idx + 4].copy_from_slice(&color); } } } @@ -88,48 +110,68 @@ fn draw_text(rgba: &mut [u8], size: usize, text: &str, cx: f32, cy: f32, scale: } } -/// Renders a dual badge: "behind" (blue) top-left and "ahead" (orange) top-right, matching -/// the colors of the sync-stats pills in the status bar. A side is only drawn when its -/// count is non-zero. Returns `None` when there's nothing to show at all, so the caller -/// can clear the overlay icon entirely. -fn render_badge_icon(ahead: u32, behind: u32) -> Option> { - if ahead == 0 && behind == 0 { +/// Draws white `text` centered at `(cx, cy)`, scaling each font pixel up by `scale`. +fn draw_text(rgba: &mut [u8], size: usize, text: &str, cx: f32, cy: f32, scale: usize) { + for offset in [(-1, 0), (1, 0), (0, -1), (0, 1)] { + draw_text_layer(rgba, size, text, cx, cy, scale, offset, TEXT_SHADOW); + } + draw_text_layer(rgba, size, text, cx, cy, scale, (0, 0), TEXT_FILL); +} + +fn text_scale(text: &str) -> usize { + match text.len() { + 0 | 1 => 7, + 2 => 5, + _ => 4, + } +} + +/// Renders a single large badge with `count`. Returns `None` when there's nothing to show, +/// so the caller can clear the overlay icon. +fn render_badge_icon(count: u32) -> Option> { + if count == 0 { return None; } const SIZE: usize = 64; - const RADIUS: f32 = 26.0; - const SCALE: usize = 5; - const MARGIN: f32 = 2.0; + const RADIUS: f32 = 29.0; let mut rgba = vec![0u8; SIZE * SIZE * 4]; + let center = SIZE as f32 / 2.0; - let (left_cx, left_cy) = (RADIUS + MARGIN, RADIUS + MARGIN); - let (right_cx, right_cy) = (SIZE as f32 - RADIUS - MARGIN, RADIUS + MARGIN); - - if behind > 0 { - draw_circle(&mut rgba, SIZE, left_cx, left_cy, RADIUS, BEHIND_FILL, BEHIND_BORDER); - draw_text(&mut rgba, SIZE, &cap_text(behind), left_cx, left_cy, SCALE); - } - if ahead > 0 { - draw_circle(&mut rgba, SIZE, right_cx, right_cy, RADIUS, AHEAD_FILL, AHEAD_BORDER); - draw_text(&mut rgba, SIZE, &cap_text(ahead), right_cx, right_cy, SCALE); - } + let text = cap_text(count); + draw_circle( + &mut rgba, + SIZE, + center, + center, + RADIUS, + BADGE_FILL, + BADGE_BORDER, + ); + draw_text(&mut rgba, SIZE, &text, center, center, text_scale(&text)); Some(Image::new_owned(rgba, SIZE as u32, SIZE as u32)) } -/// Sets the taskbar badge from `ahead`/`behind` (both 0 clears it). Windows-only: Windows +/// Sets the taskbar badge to `ahead + behind + changes` (0 clears it). Windows-only: Windows /// has no native numeric badge API, so this draws and applies a small overlay icon instead. -/// No-op on other platforms — non-Windows desktops should use `Window::set_badge_count` +/// No-op on other platforms: non-Windows desktops should use `Window::set_badge_count` /// for a real native badge instead, which this app doesn't currently wire up. #[tauri::command] -pub fn set_sync_badge(app: tauri::AppHandle, ahead: u32, behind: u32) -> Result<(), String> { +pub fn set_sync_badge( + app: tauri::AppHandle, + ahead: u32, + behind: u32, + changes: u32, +) -> Result<(), String> { + let count = ahead.saturating_add(behind).saturating_add(changes); + #[cfg(target_os = "windows")] { let Some(window) = app.get_webview_window("main") else { return Ok(()); }; - let icon = render_badge_icon(ahead, behind); + let icon = render_badge_icon(count); window .set_overlay_icon(icon) .map_err(|err| format!("Could not set taskbar badge: {err}"))?; @@ -137,7 +179,7 @@ pub fn set_sync_badge(app: tauri::AppHandle, ahead: u32, behind: u32) -> Result< #[cfg(not(target_os = "windows"))] { - let _ = (app, ahead, behind); + let _ = (app, count); } Ok(()) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 65589d7..cbd57ed 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -7,14 +7,13 @@ use badge::set_sync_badge; use git::{ SearchCancellationState, apply_file_patch, cancel_code_search, cancel_file_history, checkout_branch, commit, commit_ai_generate, commit_ai_load, commit_ai_local_models, - commit_ai_status, compare_commits, compare_file_to_head, compare_file_to_parent, - create_branch, cred_delete, cred_load, cred_save, delete_branch, - diff_file_against_working_tree, get_file_patch, get_remote_url, get_status, list_branches, - list_commits, list_file_history, list_repository_files, merge_branch, open_repo_in_explorer, - fetch, open_repository, open_repository_bundle, open_repository_file, pull, push, - read_conflict, rename_branch, resolve_conflict, resolve_conflict_side, - restore_file_from_commit, restore_files, restore_to_commit, search_code_introductions, - stage_files, unstage_files, + commit_ai_status, compare_commits, compare_file_to_head, compare_file_to_parent, create_branch, + cred_delete, cred_load, cred_save, delete_branch, diff_file_against_working_tree, fetch, + get_file_patch, get_remote_url, get_status, list_branches, list_commits, list_file_history, + list_repository_files, merge_branch, open_repo_in_explorer, open_repository, + open_repository_bundle, open_repository_file, pull, push, read_conflict, rename_branch, + resolve_conflict, resolve_conflict_side, restore_file_from_commit, restore_files, + restore_to_commit, search_code_introductions, stage_files, unstage_files, }; fn main() { diff --git a/src/App.svelte b/src/App.svelte index 3401a52..bfe317f 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -679,7 +679,7 @@ repoPath = ""; status = null; lastStatusFingerprint = ""; - void setSyncBadge(0, 0).catch(() => {}); + void setSyncBadge(0, 0, 0).catch(() => {}); } branches = []; commits = []; @@ -713,7 +713,7 @@ repoPath = activeRepoPath; lastStatusFingerprint = statusFingerprint(nextStatus); upsertRepoTab(activeRepoPath, nextStatus); - void setSyncBadge(nextStatus.ahead, nextStatus.behind).catch(() => {}); + void setSyncBadge(nextStatus.ahead, nextStatus.behind, nextStatus.files.length).catch(() => {}); } function errorToMessage(error: unknown): string { diff --git a/src/lib/git.ts b/src/lib/git.ts index 0c5f330..19d8db1 100644 --- a/src/lib/git.ts +++ b/src/lib/git.ts @@ -37,10 +37,10 @@ export function getStatus(path: string): Promise { return invoke("get_status", { path }); } -// Sets the taskbar icon badge to ahead + behind (0 clears it). Windows only — a no-op on +// Sets the taskbar icon badge to ahead + behind + changed status files (0 clears it). Windows only — a no-op on // other platforms, since Windows has no native numeric badge to fall back to. -export function setSyncBadge(ahead: number, behind: number): Promise { - return invoke("set_sync_badge", { ahead, behind }); +export function setSyncBadge(ahead: number, behind: number, changes: number): Promise { + return invoke("set_sync_badge", { ahead, behind, changes }); } export function listBranches(path: string): Promise {