A free, open source, and extensible speech-to-text application that works completely offline.
fix: tray icon invisible on Windows with dark taskbar + light apps (#1423) (#1636)
Sahil Dahalbf258d10fbdb
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rsindex bbefb8fd..0d81a421 100644--- a/src-tauri/src/lib.rs+++ b/src-tauri/src/lib.rs@@ -896,8 +896,8 @@ pub fn run(cli_args: CliArgs) {}tauri::WindowEvent::ThemeChanged(theme) => {log::info!("Theme changed to: {:?}", theme);- // Update tray icon to match new theme, maintaining idle state- utils::change_tray_icon(window.app_handle(), utils::TrayIconState::Idle);+ // Re-apply the current tray state with the new theme's icon set+ utils::refresh_tray_icon(window.app_handle());}_ => {}})diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rsindex 83e4122b..4751c35c 100644--- a/src-tauri/src/tray.rs+++ b/src-tauri/src/tray.rs@@ -49,6 +49,16 @@ pub fn get_current_theme(app: &AppHandle) -> AppTheme {// On Linux, always use the colored themeAppTheme::Colored} else {+ // On Windows the tray icon sits on the taskbar, which follows the+ // *system* theme (SystemUsesLightTheme), not the app theme. With the+ // "Custom" personalization mode the two can differ (e.g. dark taskbar+ // + light apps), and the window theme would pick an icon that is+ // invisible against the taskbar.+ #[cfg(target_os = "windows")]+ if let Some(theme) = windows_taskbar_theme() {+ return theme;+ }+// On other platforms, map system theme to our app themeif let Some(main_window) = app.get_webview_window("main") {match main_window.theme().unwrap_or(Theme::Dark) {@@ -62,6 +72,27 @@ pub fn get_current_theme(app: &AppHandle) -> AppTheme {}}+/// Reads the Windows taskbar theme from the registry.+///+/// Returns None if the value is missing (older Windows 10 builds default to a+/// dark taskbar there, but falling back to the window theme is safer than+/// guessing).+#[cfg(target_os = "windows")]+fn windows_taskbar_theme() -> Option<AppTheme> {+ use winreg::enums::HKEY_CURRENT_USER;+ use winreg::RegKey;++ let personalize = RegKey::predef(HKEY_CURRENT_USER)+ .open_subkey("Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize")+ .ok()?;+ let system_uses_light: u32 = personalize.get_value("SystemUsesLightTheme").ok()?;+ Some(if system_uses_light == 1 {+ AppTheme::Light+ } else {+ AppTheme::Dark+ })+}+/// Gets the appropriate icon path for the given theme and statepub fn get_icon_path(theme: AppTheme, state: TrayIconState) -> &'static str {match (theme, state) {@@ -104,13 +135,21 @@ pub fn change_tray_icon(app: &AppHandle, icon: TrayIconState) {let menu_started = std::time::Instant::now();update_tray_menu(app, None);debug!(- "tray icon change ({:?}): set_icon={:?} menu={:?}",+ "tray icon change ({:?}): icon={} set_icon={:?} menu={:?}",icon,+ icon_path,icon_elapsed,menu_started.elapsed());}+/// Re-applies the last known tray state — for when only the *theme* changed+/// and the state itself (idle/recording/transcribing) should be preserved.+pub fn refresh_tray_icon(app: &AppHandle) {+ let icon = app.state::<CurrentTrayIconState>().get();+ change_tray_icon(app, icon);+}+fn load_tray_icon(resolved_icon_path: tauri::Result<PathBuf>) -> tauri::Result<Image<'static>> {let resolved_icon_path = resolved_icon_path?;Image::from_path(&resolved_icon_path).map(Image::to_owned)