From 174a352d786c6876452a830660d61264fb62bbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= Date: Sat, 5 Oct 2024 17:42:54 +0200 Subject: [PATCH] fix(appearance): apply density to both themes --- .../src/pages/desktop/appearance/mod.rs | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/cosmic-settings/src/pages/desktop/appearance/mod.rs b/cosmic-settings/src/pages/desktop/appearance/mod.rs index bb8f2d6..6866b6d 100644 --- a/cosmic-settings/src/pages/desktop/appearance/mod.rs +++ b/cosmic-settings/src/pages/desktop/appearance/mod.rs @@ -13,7 +13,7 @@ use cosmic::config::CosmicTk; use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry}; use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb, Srgba}; use cosmic::cosmic_theme::{ - CornerRadii, Density, Theme, ThemeBuilder, ThemeMode, DARK_THEME_BUILDER_ID, + CornerRadii, Density, Spacing, Theme, ThemeBuilder, ThemeMode, DARK_THEME_BUILDER_ID, LIGHT_THEME_BUILDER_ID, }; use cosmic::iced_core::{alignment, Background, Color, Length}; @@ -681,18 +681,17 @@ impl Page { _ = config.set("header_size", density); } - let Some(config) = self.theme_builder_config.as_ref() else { - return Command::none(); - }; + let spacing: Spacing = density.into(); - let spacing = density.into(); + let light_config = Theme::light_config().ok(); + let dark_config = Theme::dark_config().ok(); - if self - .theme_builder - .set_spacing(config, spacing) - .unwrap_or_default() - { - self.theme_config_write("spacing", spacing); + // 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); } tokio::task::spawn(async move {