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

5
src/widget/button/icon.rs
View file

@ -124,11 +124,6 @@ impl<'a, Message> Button<'a, Message> {
self
}
pub fn inherit_colors(mut self) -> Self {
self.style = Style::IconInheritColors;
self
}
pub fn vertical(mut self, vertical: bool) -> Self {
self.variant.vertical = vertical;
self.style = Style::IconVertical;

8
src/widget/button/style.rs
View file

@ -23,9 +23,6 @@ pub struct Appearance {
/// The border [`Color`] of the button.
pub border_color: Color,
/// Opacity of the button.
pub opacity: f32,
/// An outline placed around the border.
pub outline_width: f32,
@ -36,7 +33,7 @@ pub struct Appearance {
pub icon_color: Option<Color>,
/// The text [`Color`] of the button.
pub text_color: Color,
pub text_color: Option<Color>,
}
impl Appearance {
@ -48,11 +45,10 @@ impl Appearance {
border_radius: BorderRadius::from(0.0),
border_width: 0.0,
border_color: Color::TRANSPARENT,
opacity: 1.0,
outline_width: 0.0,
outline_color: Color::TRANSPARENT,
icon_color: None,
text_color: Color::BLACK,
text_color: None,
}
}
}

2
src/widget/button/widget.rs
View file

@ -306,7 +306,7 @@ where
theme,
&renderer::Style {
icon_color: styling.icon_color.unwrap_or(renderer_style.icon_color),
text_color: styling.text_color,
text_color: styling.text_color.unwrap_or(renderer_style.icon_color),
scale_factor: renderer_style.scale_factor,
},
content_layout,