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

fix(theme): use overlay colors directly for the text button

Browse source
This commit is contained in:
Ashley Wulber 2023-08-18 13:36:03 -04:00 • committed by Ashley Wulber
parent be49bb2a25
commit 4f964a4bc8
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cosmic-theme/src/model/theme.rs
View file

@ -713,6 +713,24 @@ impl ThemeBuilder {
let mut button_disabled_border = button_border; let mut button_disabled_border = button_border;
button_disabled_border.alpha *= 0.5; button_disabled_border.alpha *= 0.5;
let mut text_button = Component::component(
Srgba::new(0.0, 0.0, 0.0, 0.0),
p_ref.neutral_10,
accent,
p_ref.neutral_9,
is_high_contrast,
p_ref.neutral_8,
);
let overlay = p_ref.neutral_10.clone();
let mut hover = overlay.clone();
hover.alpha = 0.1;
text_button.hover = hover;
let mut press = overlay.clone();
press.alpha = 0.2;
text_button.pressed = press;
text_button.focus = text_button.base.clone();
let mut theme: Theme<Srgba> = Theme { let mut theme: Theme<Srgba> = Theme {
name: palette.name().to_string(), name: palette.name().to_string(),
background: Container::new( background: Container::new(
@ -800,14 +818,7 @@ impl ThemeBuilder {
p_ref.neutral_0.to_owned(), p_ref.neutral_0.to_owned(),
accent.clone(), accent.clone(),
), ),
text_button: Component::component( text_button,
Srgba::new(0.0, 0.0, 0.0, 0.0),
p_ref.neutral_10,
accent,
p_ref.neutral_9,
is_high_contrast,
p_ref.neutral_8,
),
palette: palette.inner(), palette: palette.inner(),
spacing, spacing,
corner_radii, corner_radii,