Rebase

squidowl · Sep 20, 2024 · f51c956 · f51c956
1 parent a964dc8
commit f51c956
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/data/src/config.rs b/data/src/config.rs
@@ -18,6 +18,7 @@ pub use self::notification::Notifications;
 pub use self::proxy::Proxy;
 pub use self::server::Server;
 pub use self::sidebar::Sidebar;
+
 use crate::appearance::{self, Appearance};
 use crate::audio::{self, Sound};
 use crate::environment::config_dir;

diff --git a/src/main.rs b/src/main.rs
@@ -204,7 +204,7 @@ pub enum Screen {
 
 #[derive(Debug)]
 pub enum Message {
-    ThemesReloaded(config::Themes),
+    AppearanceReloaded(data::appearance::Appearance),
     ScreenConfigReloaded(Result<Config, config::Error>),
     Dashboard(dashboard::Message),
     Stream(stream::Update),
@@ -281,8 +281,8 @@ impl Halloy {
 
     fn update(&mut self, message: Message) -> Task<Message> {
         match message {
-            Message::ThemesReloaded(updated) => {
-                self.config.themes = updated;
+            Message::AppearanceReloaded(appearance) => {
+                self.config.appearance = appearance;
                 Task::none()
             }
             Message::ScreenConfigReloaded(updated) => {
@@ -333,8 +333,8 @@ impl Halloy {
                         Task::none()
                     }
                     Some(dashboard::Event::ReloadThemes) => Task::future(Config::load())
-                        .and_then(|config| Task::done(config.themes))
-                        .map(Message::ThemesReloaded),
+                        .and_then(|config| Task::done(config.appearance))
+                        .map(Message::AppearanceReloaded),
                     Some(dashboard::Event::QuitServer(server)) => {
                         self.clients.quit(&server, None);
                         Task::none()