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

fix(widget): allow None for button text color to inherit from container

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-09-18 08:28:51 +02:00
parent 6acdba28aa
commit b404497e76
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
5 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/theme/style/button.rs
View file

@ -20,7 +20,6 @@ pub enum Button {
Destructive,
Link,
Icon,
IconInheritColors,
IconVertical,
#[default]
Standard,
@ -32,7 +31,7 @@ pub fn appearance(
theme: &crate::Theme,
focused: bool,
style: &Button,
color: impl Fn(&Component<Alpha<Rgb, f32>>) -> (Color, Color, Option<Color>),
color: impl Fn(&Component<Alpha<Rgb, f32>>) -> (Color, Option<Color>, Option<Color>),
) -> Appearance {
let cosmic = theme.cosmic();
let mut corner_radii = &cosmic.corner_radii.radius_xl;
@ -54,28 +53,26 @@ pub fn appearance(
appearance.icon_color = icon;
}
Button::Icon | Button::IconInheritColors | Button::IconVertical => {
Button::Icon | Button::IconVertical => {
if let Button::IconVertical = style {
corner_radii = &cosmic.corner_radii.radius_m;
}
let (background, text, icon) = color(&cosmic.icon_button);
let (background, _text, icon) = color(&cosmic.icon_button);
appearance.background = Some(Background::Color(background));
// appearance.text_color = text;
// appearance.icon_color = icon;
if let Button::IconInheritColors = style {
} else if focused {
appearance.text_color = cosmic.accent.on.into();
if focused {
appearance.text_color = Some(cosmic.accent.on.into());
appearance.icon_color = Some(cosmic.accent.on.into());
} else {
appearance.text_color = text;
appearance.icon_color = icon;
}
}
Button::Link => {
appearance.background = None;
appearance.icon_color = Some(cosmic.accent.base.into());
appearance.text_color = cosmic.accent.base.into();
appearance.text_color = Some(cosmic.accent.base.into());
corner_radii = &cosmic.corner_radii.radius_0;
}
@ -105,7 +102,7 @@ impl StyleSheet for crate::Theme {
appearance(self, focused, style, |component| {
(
component.base.into(),
component.on.into(),
Some(component.on.into()),
Some(component.on.into()),
)
})
@ -121,7 +118,7 @@ impl StyleSheet for crate::Theme {
background.a *= 0.5;
(
background,
component.on_disabled.into(),
Some(component.on_disabled.into()),
Some(component.on_disabled.into()),
)
})
@ -139,7 +136,7 @@ impl StyleSheet for crate::Theme {
appearance(self, focused, style, |component| {
(
component.hover.into(),
component.on.into(),
Some(component.on.into()),
Some(component.on.into()),
)
})
@ -153,7 +150,7 @@ impl StyleSheet for crate::Theme {
appearance(self, focused, style, |component| {
(
component.pressed.into(),
component.on.into(),
Some(component.on.into()),
Some(component.on.into()),
)
})