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

fix(button): icon buttons should inherit text and icon color from container

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-05-17 19:07:42 +02:00 • committed by Michael Murphy
parent 11a73354ca
commit c7dc5ab1ed
1 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,27 +13,27 @@ use crate::{
#[derive(Default)]
pub enum Button {
AppletIcon,
Custom {
active: Box<dyn Fn(bool, &crate::Theme) -> Appearance>,
disabled: Box<dyn Fn(&crate::Theme) -> Appearance>,
hovered: Box<dyn Fn(bool, &crate::Theme) -> Appearance>,
pressed: Box<dyn Fn(bool, &crate::Theme) -> Appearance>,
},
AppletMenu,
Destructive,
Link,
Icon,
HeaderBar,
Icon,
IconVertical,
Image,
Link,
MenuItem,
MenuRoot,
#[default]
Standard,
Suggested,
Text,
Transparent,
AppletMenu,
AppletIcon,
MenuRoot,
MenuItem,
}
pub fn appearance(
@ -76,8 +76,6 @@ pub fn appearance(
}
let (background, text, icon) = color(&cosmic.icon_button);
appearance.text_color = text;
appearance.icon_color = icon;
appearance.background = Some(Background::Color(background));
}
@ -162,10 +160,6 @@ impl StyleSheet for crate::Theme {
) && selected
{
Some(self.cosmic().accent_color().into())
} else if matches!(style, Button::HeaderBar) && !selected {
let mut c = Color::from(self.cosmic().background.on);
c.a = 0.75;
Some(c)
} else {
Some(component.on.into())
};
@ -211,10 +205,6 @@ impl StyleSheet for crate::Theme {
) && selected
{
Some(self.cosmic().accent_color().into())
} else if matches!(style, Button::HeaderBar) && !selected {
let mut c = Color::from(component.on);
c.a = 0.8;
Some(c)
} else {
Some(component.on.into())
};
@ -236,10 +226,6 @@ impl StyleSheet for crate::Theme {
) && selected
{
Some(self.cosmic().accent_color().into())
} else if matches!(style, Button::HeaderBar) && !selected {
let mut c = Color::from(component.on);
c.a = 0.8;
Some(c)
} else {
Some(component.on.into())
};