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

fix(button): image button rendering fixes

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-11-11 01:10:05 +01:00 • committed by Michael Murphy
parent 6c7a080209
commit 14614e4e03
4 changed files with 64 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ pub fn appearance(
}
Button::Image => {
appearance.background = Some(Background::Color(cosmic.bg_color().into()));
appearance.background = None;
appearance.text_color = Some(cosmic.accent.base.into());
appearance.icon_color = Some(cosmic.accent.base.into());
@ -90,7 +90,7 @@ pub fn appearance(
appearance.border_radius = (*corner_radii).into();
if focused {
appearance.border_width = 3.0;
appearance.border_width = 2.0;
appearance.border_color = cosmic.accent.base.into();
}
@ -178,13 +178,18 @@ impl StyleSheet for crate::Theme {
return hovered(focused, self);
}
appearance(self, focused, style, |component| {
(
component.hover.into(),
Some(component.on.into()),
Some(component.on.into()),
)
})
appearance(
self,
focused || matches!(style, Button::Image),
style,
|component| {
(
component.hover.into(),
Some(component.on.into()),
Some(component.on.into()),
)
},
)
}
fn pressed(&self, focused: bool, style: &Self::Style) -> Appearance {
@ -200,4 +205,8 @@ impl StyleSheet for crate::Theme {
)
})
}
fn selection_background(&self) -> Background {
Background::Color(self.cosmic().bg_color().into())
}
}