feat: Render tray icon colors using theme colors.

Author: Splode

src-tauri/src/commands.rs

@@ -180,6 +180,10 @@ pub fn settings_reset_defaults(
 
     timer.apply_settings(new_settings.clone());
     *tray_state.countdown_mode.lock().unwrap() = new_settings.dial_countdown;
+    let data_dir = app.path().app_data_dir().map_err(|e| e.to_string())?;
+    if let Some(theme) = themes::find(&data_dir, &new_settings.theme) {
+        *tray_state.colors.lock().unwrap() = tray::TrayColors::from_colors_map(&theme.colors);
+    }
     app.emit("settings:changed", &new_settings).ok();
     Ok(new_settings)
 }
@@ -205,6 +209,8 @@ pub fn theme_apply(
     name: String,
     app: AppHandle,
     db: State<'_, DbState>,
+    tray_state: State<'_, Arc<TrayState>>,
+    timer: State<'_, TimerController>,
 ) -> Result<Theme, String> {
     let data_dir = app
         .path()
@@ -221,6 +227,16 @@ pub fn theme_apply(
         settings::load(&conn).map_err(|e| e.to_string())?
     };
 
+    // Update tray colors and immediately re-render the icon for the new theme.
+    *tray_state.colors.lock().unwrap() = tray::TrayColors::from_colors_map(&theme.colors);
+    let snap = timer.get_snapshot();
+    let progress = if snap.total_secs > 0 {
+        snap.elapsed_secs as f32 / snap.total_secs as f32
+    } else {
+        0.0
+    };
+    tray::update_icon(&tray_state, &snap.round_type, snap.is_paused, progress);
+
     // Notify all windows so they can re-apply the new theme CSS.
     app.emit("settings:changed", &updated_settings).ok();
 

src-tauri/src/lib.rs

@@ -55,8 +55,11 @@ pub fn run() {
                 settings::load(&conn).expect("failed to load settings")
             };
 
-            // Sync tray countdown mode from saved settings.
+            // Sync tray state from saved settings.
             *tray_state.countdown_mode.lock().unwrap() = initial_settings.dial_countdown;
+            if let Some(theme) = themes::find(&app_data_dir, &initial_settings.theme) {
+                *tray_state.colors.lock().unwrap() = tray::TrayColors::from_colors_map(&theme.colors);
+            }
 
             // --- Audio engine (optional — graceful if no audio device) ---
             if let Some(audio) = audio::AudioManager::new(&initial_settings) {

src-tauri/src/tray/mod.rs

@@ -45,6 +45,27 @@ impl Default for TrayColors {
     }
 }
 
+impl TrayColors {
+    /// Build a `TrayColors` from a theme's CSS-variable color map.
+    /// Falls back to `TrayColors::default()` values for any key that is
+    /// missing or unparseable.
+    pub fn from_colors_map(colors: &std::collections::HashMap<String, String>) -> Self {
+        let d = Self::default();
+        let get = |key: &str, fallback: [u8; 4]| {
+            colors.get(key)
+                .and_then(|hex| parse_hex_color(hex))
+                .unwrap_or(fallback)
+        };
+        Self {
+            background: get("--color-background", d.background),
+            focus_round: get("--color-focus-round", d.focus_round),
+            short_round: get("--color-short-round", d.short_round),
+            long_round:  get("--color-long-round",  d.long_round),
+            foreground:  get("--color-foreground",   d.foreground),
+        }
+    }
+}
+
 /// Parse a CSS hex color (#RRGGBB or #RRGGBBAA) into [r, g, b, a].
 pub fn parse_hex_color(hex: &str) -> Option<[u8; 4]> {
     let h = hex.strip_prefix('#')?;