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

perf(desktop): set active_hint and gap configs atomically for theme

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-09-18 21:46:19 +02:00
parent 94562eae88
commit 731828c099
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

48
cosmic-settings/src/pages/desktop/appearance.rs
View file

@ -28,6 +28,7 @@ use cosmic_settings_page::Section;
use cosmic_settings_page::{self as page, section}; use cosmic_settings_page::{self as page, section};
use cosmic_settings_wallpaper as wallpaper; use cosmic_settings_wallpaper as wallpaper;
use ron::ser::PrettyConfig; use ron::ser::PrettyConfig;
use serde::Serialize;
use slab::Slab; use slab::Slab;
use slotmap::SlotMap; use slotmap::SlotMap;
use tokio::io::AsyncBufReadExt; use tokio::io::AsyncBufReadExt;
@ -478,20 +479,22 @@ impl Page {
return Command::none(); return Command::none();
}; };
needs_build = self let active_hint = match msg {
spin_button::Message::Increment => {
self.theme_builder.active_hint.saturating_add(1)
}
spin_button::Message::Decrement => {
self.theme_builder.active_hint.saturating_sub(1)
}
};
if self
.theme_builder .theme_builder
.set_active_hint( .set_active_hint(config, active_hint)
config, .unwrap_or_default()
match msg { {
spin_button::Message::Increment => { self.theme_config_write("active_hint", active_hint);
self.theme_builder.active_hint.saturating_add(1) }
}
spin_button::Message::Decrement => {
self.theme_builder.active_hint.saturating_sub(1)
}
},
)
.unwrap_or_default();
} }
Message::GapSize(msg) => { Message::GapSize(msg) => {
@ -508,10 +511,13 @@ impl Page {
spin_button::Message::Decrement => self.theme_builder.gaps.1.saturating_sub(1), spin_button::Message::Decrement => self.theme_builder.gaps.1.saturating_sub(1),
}; };
needs_build = self if self
.theme_builder .theme_builder
.set_gaps(config, gaps) .set_gaps(config, gaps)
.unwrap_or_default(); .unwrap_or_default()
{
self.theme_config_write("gaps", gaps);
}
} }
Message::ApplicationBackground(u) => { Message::ApplicationBackground(u) => {
@ -1111,6 +1117,18 @@ impl Page {
Ok(()) Ok(())
} }
fn theme_config_write<T: Serialize>(&self, name: &str, value: T) {
let config_res = if self.theme_mode.is_dark {
Theme::dark_config()
} else {
Theme::light_config()
};
if let Ok(config) = config_res {
_ = config.set(name, value);
}
}
// TODO: cache panel and dock configs so that they needn't be re-read // TODO: cache panel and dock configs so that they needn't be re-read
fn update_panel_radii(roundness: Roundness) { fn update_panel_radii(roundness: Roundness) {
let panel_config_helper = CosmicPanelConfig::cosmic_config("Panel").ok(); let panel_config_helper = CosmicPanelConfig::cosmic_config("Panel").ok();