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

fix(appearance): clean up density message

Browse source 
Makes the syncing of the dark and light modes use an already available function, rather than explicitly doing it inside the message.
This commit is contained in:
Vukašin Vojinović 2024-10-22 01:20:26 +02:00 • committed by Michael Murphy
parent 1222cbb515
commit 537592a5ac
1 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -742,17 +742,18 @@ impl Page {
_ = config.set("header_size", density);
}
let spacing: Spacing = density.into();
let Some(config) = self.theme_builder_config.as_ref() else {
return Command::none();
};
let light_config = Theme::light_config().ok();
let dark_config = Theme::dark_config().ok();
let spacing = density.into();
// Update both light and dark theme configs
if let Some(config) = light_config {
_ = config.set("spacing", spacing);
}
if let Some(config) = dark_config {
_ = config.set("spacing", spacing);
if self
.theme_builder
.set_spacing(config, spacing)
.unwrap_or_default()
{
self.theme_config_write("spacing", spacing);
}
tokio::task::spawn(async move {
@ -1252,6 +1253,19 @@ impl Page {
}
}
if theme_builder.spacing != current_theme_builder.spacing {
if let Err(err) =
theme_builder.set_spacing(&other_builder_config, current_theme_builder.spacing)
{
tracing::error!(?err, "Error setting spacing");
}
if let Err(err) = theme.set_spacing(&other_theme_config, current_theme_builder.spacing)
{
tracing::error!(?err, "Error setting spacing");
}
}
Ok(())
}