leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(appearance): retain cached icon theme settings when changing theme mode

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-03-19 19:00:51 +01:00
parent 814978379a
commit 0839361e12
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/pages/desktop/appearance.rs
View file

@ -8,7 +8,6 @@ use std::sync::Arc;
use apply::Apply; use apply::Apply;
use ashpd::desktop::file_chooser::{FileFilter, SelectedFiles}; use ashpd::desktop::file_chooser::{FileFilter, SelectedFiles};
use cosmic::cctk::sctk::reexports::protocols::xdg;
use cosmic::config::CosmicTk; use cosmic::config::CosmicTk;
use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry}; use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry};
use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb, Srgba}; use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb, Srgba};
@ -442,7 +441,7 @@ impl Page {
_ = config.set::<bool>("is_dark", enabled); _ = config.set::<bool>("is_dark", enabled);
} }
} }
*self = Self::from((self.theme_mode_config.clone(), self.theme_mode)); self.reload_theme_mode();
let theme_builder = self.theme_builder.clone(); let theme_builder = self.theme_builder.clone();
Command::perform(async {}, |()| { Command::perform(async {}, |()| {
@ -648,7 +647,8 @@ impl Page {
tracing::error!("Failed to get the theme config."); tracing::error!("Failed to get the theme config.");
} }
*self = Self::from((self.theme_mode_config.clone(), self.theme_mode)); self.reload_theme_mode();
Command::perform(async {}, |()| { Command::perform(async {}, |()| {
crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(new_theme))) crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(new_theme)))
}) })
@ -792,7 +792,7 @@ impl Page {
tracing::error!("Failed to get the theme config."); tracing::error!("Failed to get the theme config.");
} }
*self = Self::from((self.theme_mode_config.clone(), self.theme_mode)); self.reload_theme_mode();
Command::perform(async {}, |()| { Command::perform(async {}, |()| {
crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(new_theme))) crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(new_theme)))
}) })
@ -905,6 +905,16 @@ impl Page {
ret ret
} }
fn reload_theme_mode(&mut self) {
let icon_themes = std::mem::take(&mut self.icon_themes);
let icon_theme_active = self.icon_theme_active.take();
*self = Self::from((self.theme_mode_config.clone(), self.theme_mode));
self.icon_themes = icon_themes;
self.icon_theme_active = icon_theme_active;
}
fn update_color_picker( fn update_color_picker(
&mut self, &mut self,
message: &ColorPickerUpdate, message: &ColorPickerUpdate,