leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: update toggler colors

Browse source
This commit is contained in:
Ashley Wulber 2023-08-07 16:03:44 -04:00 • committed by Ashley Wulber
parent ff83f893ef
commit 1c5a233a98
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/theme/mod.rs
View file

@ -15,6 +15,7 @@ pub use self::segmented_button::SegmentedButton;
use cosmic_config::config_subscription; use cosmic_config::config_subscription;
use cosmic_config::CosmicConfigEntry; use cosmic_config::CosmicConfigEntry;
use cosmic_theme::composite::over;
use cosmic_theme::util::CssColor; use cosmic_theme::util::CssColor;
use cosmic_theme::Component; use cosmic_theme::Component;
use cosmic_theme::LayeredTheme; use cosmic_theme::LayeredTheme;
@ -808,16 +809,13 @@ impl toggler::StyleSheet for Theme {
fn active(&self, _style: &Self::Style, is_active: bool) -> toggler::Appearance { fn active(&self, _style: &Self::Style, is_active: bool) -> toggler::Appearance {
let theme = self.cosmic(); let theme = self.cosmic();
toggler::Appearance { toggler::Appearance {
background: if is_active { background: if is_active {
theme.accent.base.into() theme.accent.base.into()
} else { } else {
//TODO: Grab neutral from palette
theme.palette.neutral_5.into() theme.palette.neutral_5.into()
}, },
background_border: None, background_border: None,
//TODO: Grab neutral from palette
foreground: theme.palette.neutral_2.into(), foreground: theme.palette.neutral_2.into(),
foreground_border: None, foreground_border: None,
} }
@ -828,11 +826,12 @@ impl toggler::StyleSheet for Theme {
//TODO: grab colors from palette //TODO: grab colors from palette
let mut neutral_10 = cosmic.palette.neutral_10; let mut neutral_10 = cosmic.palette.neutral_10;
neutral_10.alpha = 0.1; neutral_10.alpha = 0.1;
toggler::Appearance { toggler::Appearance {
background: if is_active { background: if is_active {
cosmic.accent.hover over(neutral_10, cosmic.accent_color())
} else { } else {
neutral_10 over(neutral_10, cosmic.palette.neutral_5)
} }
.into(), .into(),
..self.active(style, is_active) ..self.active(style, is_active)