fix: theme is not applied on startup

SilenLoc · May 4, 2023 · 95c483c · 95c483c
1 parent 8b86c02
commit 95c483c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -36,6 +36,7 @@ impl eframe::App for TypeFastApp {
             egui::ScrollArea::vertical()
                 .id_source("all")
                 .show(ui, |ui| {
+                    self.settings.set_new_theme(ctx);
                     self.type_state
                         .render(ui, &mut self.score, &mut self.settings);
 

diff --git a/src/settings/mod.rs b/src/settings/mod.rs
@@ -16,29 +16,32 @@ use crate::{
 pub struct TFSetting {
     pub command: String,
     last_command: String,
+    last_theme: TFTheme,
     theme: TFTheme,
     #[serde(skip)]
     pub level: Algorithm,
     pub size: u32,
     level_changed: bool,
 }
 
-#[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq)]
+#[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq, Clone, Copy)]
 
 pub enum TFTheme {
     Macchiato,
     Frappe,
     Latte,
     Mocha,
+    Default,
 }
 
 impl TFTheme {
-    pub fn to_cat_theme(&self) -> catppuccin_egui::Theme {
+    pub fn to_cat_theme(self) -> catppuccin_egui::Theme {
         match self {
             TFTheme::Macchiato => catppuccin_egui::MACCHIATO,
             TFTheme::Frappe => catppuccin_egui::FRAPPE,
             TFTheme::Latte => catppuccin_egui::LATTE,
             TFTheme::Mocha => catppuccin_egui::MOCHA,
+            TFTheme::Default => catppuccin_egui::MACCHIATO,
         }
     }
 }
@@ -51,6 +54,7 @@ impl Default for TFSetting {
             level: ALGS[0],
             size: 2,
             level_changed: false,
+            last_theme: TFTheme::Default,
             theme: TFTheme::Macchiato,
         }
     }
@@ -98,8 +102,14 @@ impl TFSetting {
                 ui.selectable_value(&mut self.theme, TFTheme::Latte, "Latte");
                 ui.selectable_value(&mut self.theme, TFTheme::Mocha, "Mocha");
             });
+        self.set_new_theme(ctx);
+    }
 
-        catppuccin_egui::set_theme(ctx, self.theme.to_cat_theme());
+    pub fn set_new_theme(&mut self, ctx: &egui::Context) {
+        if self.last_theme != self.theme {
+            catppuccin_egui::set_theme(ctx, self.theme.to_cat_theme());
+            self.last_theme = self.theme
+        }
     }
 
     pub fn notify_help(&mut self, text: &str) {