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

fix(appearance): regressions in changing theme mode and density

Browse source 
Closes #1303
Closes #1304
This commit is contained in:
Michael Aaron Murphy 2025-08-01 18:39:57 +02:00
parent a0f7b31d89
commit 8d353305f8
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
2 changed files with 2 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cosmic-settings/src/app.rs
View file

@ -851,12 +851,6 @@ impl cosmic::Application for SettingsApp {
.map(Into::into), .map(Into::into),
); );
} }
if let Some(page) = self.pages.page_mut::<appearance::Page>() {
tasks.push(
page.update(appearance::Message::NewTheme(Box::new(new_theme.clone())))
.map(Into::into),
);
}
Task::batch(tasks) Task::batch(tasks)
} }

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

@ -15,7 +15,7 @@ use cosmic::app::ContextDrawer;
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}; use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb};
use cosmic::cosmic_theme::{CornerRadii, Density, Theme, ThemeBuilder}; use cosmic::cosmic_theme::{CornerRadii, Density, ThemeBuilder};
#[cfg(feature = "xdg-portal")] #[cfg(feature = "xdg-portal")]
use cosmic::dialog::file_chooser::{self, FileFilter}; use cosmic::dialog::file_chooser::{self, FileFilter};
use cosmic::iced_core::{Alignment, Length}; use cosmic::iced_core::{Alignment, Length};
@ -142,7 +142,6 @@ pub enum Message {
#[cfg(feature = "xdg-portal")] #[cfg(feature = "xdg-portal")]
ImportSuccess(Box<ThemeBuilder>), ImportSuccess(Box<ThemeBuilder>),
Left, Left,
NewTheme(Box<Theme>),
PaletteAccent(cosmic::iced::Color), PaletteAccent(cosmic::iced::Color),
Reset, Reset,
Roundness(Roundness), Roundness(Roundness),
@ -224,14 +223,6 @@ impl Page {
let mut theme_staged: Option<theme_manager::ThemeStaged> = None; let mut theme_staged: Option<theme_manager::ThemeStaged> = None;
match message { match message {
Message::NewTheme(theme) => {
_ = self.theme_manager.dark_mode(theme.is_dark);
self.theme_manager
.selected_customizer_mut()
.set_theme(*theme);
}
Message::Autoswitch(enabled) => self.theme_manager.auto_switch(enabled), Message::Autoswitch(enabled) => self.theme_manager.auto_switch(enabled),
Message::DarkMode(enabled) => { Message::DarkMode(enabled) => {
@ -290,18 +281,14 @@ impl Page {
} }
Message::Density(density) => { Message::Density(density) => {
tracing::info!("Density changed: {:?}", density);
self.density = density; self.density = density;
theme_staged = self.theme_manager.set_spacing(density.into());
if let Some(config) = self.tk_config.as_mut() { if let Some(config) = self.tk_config.as_mut() {
_ = config.set("interface_density", density); _ = config.set("interface_density", density);
_ = config.set("header_size", density); _ = config.set("header_size", density);
} }
let spacing = density.into();
self.theme_manager.set_spacing(spacing);
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
tokio::task::spawn(async move { tokio::task::spawn(async move {
Self::update_panel_spacing(density); Self::update_panel_spacing(density);