Fixed theme switching.

mkrueger · Dec 22, 2024 · 4843872 · 4843872
1 parent 32de05b
commit 4843872
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/crates/icy_term/src/data/options.rs b/crates/icy_term/src/data/options.rs
@@ -329,6 +329,18 @@ impl Options {
         Ok(Options::default())
     }
 
+    pub(crate) fn get_theme(&self) -> egui::ThemePreference {
+        if let Some(dark_mode) = self.is_dark_mode {
+            if dark_mode {
+                egui::ThemePreference::Dark
+            } else {
+                egui::ThemePreference::Light
+            }
+        } else {
+            egui::ThemePreference::System
+        }
+    }
+
     /// Returns the store options of this [`Options`].
     ///
     /// # Errors

diff --git a/crates/icy_term/src/ui/app.rs b/crates/icy_term/src/ui/app.rs
@@ -47,14 +47,8 @@ impl MainWindow {
         //  #[cfg(target_arch = "wasm32")]
         let is_fullscreen_mode = false;
 
-        // try to detect dark vs light mode from the host system; default to dark
-        let is_dark = if let Some(dark_mode) = &options.is_dark_mode {
-            *dark_mode
-        } else {
-            dark_light::detect() != dark_light::Mode::Light
-        };
         let ctx: &egui::Context = &cc.egui_ctx;
-        ctx.set_visuals(if is_dark { egui::Visuals::dark() } else { egui::Visuals::light() });
+        ctx.set_theme(options.get_theme());
 
         let mut initial_upload_directory = None;