From 3ee829f04fcc377182c8a7c99d8abe139c05d1a4 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 5 Oct 2023 17:58:43 -0400 Subject: [PATCH] fix(theme): typo and derive PartialEq for ThemeBuilder --- cosmic-theme/src/model/theme.rs | 9 +++++++-- src/app/cosmic.rs | 15 ++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cosmic-theme/src/model/theme.rs b/cosmic-theme/src/model/theme.rs index 5ced23f0..1be057a8 100644 --- a/cosmic-theme/src/model/theme.rs +++ b/cosmic-theme/src/model/theme.rs @@ -459,7 +459,12 @@ where /// Helper for building customized themes #[derive( - Clone, Debug, Serialize, Deserialize, cosmic_config::cosmic_config_derive::CosmicConfigEntry, + Clone, + Debug, + Serialize, + Deserialize, + cosmic_config::cosmic_config_derive::CosmicConfigEntry, + PartialEq, )] pub struct ThemeBuilder { /// override the palette for the builder @@ -528,7 +533,7 @@ impl ThemeBuilder { pub fn dark_high_contrast() -> Self { let palette: CosmicPalette = DARK_PALETTE.to_owned().into(); Self { - palette: CosmicPalette::HighContrastLight(palette.inner()), + palette: CosmicPalette::HighContrastDark(palette.inner()), ..Default::default() } } diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs index 5ddde355..0d13e3fd 100644 --- a/src/app/cosmic.rs +++ b/src/app/cosmic.rs @@ -163,16 +163,13 @@ where cosmic_theme::THEME_MODE_ID.into(), cosmic_theme::ThemeMode::version(), ) - .map(|(_, u)| { - tracing::error!("{u:?}"); - match u { - Ok(t) => Message::SystemThemeModeChange(t), - Err((errors, t)) => { - for e in errors { - tracing::error!("{e}"); - } - Message::SystemThemeModeChange(t) + .map(|(_, u)| match u { + Ok(t) => Message::SystemThemeModeChange(t), + Err((errors, t)) => { + for e in errors { + tracing::error!("{e}"); } + Message::SystemThemeModeChange(t) } }) .map(super::Message::Cosmic),