me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove ambiguous text_color attributes for Checkbox and Radio

Browse source 
Instead, always use a `StyleSheet`.
This commit is contained in:
Héctor Ramón Jiménez 2022-01-20 18:34:15 +07:00
parent a3744ec97a
commit 93285d85b0
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
6 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

14
native/src/widget/checkbox.rs
View file

@ -10,8 +10,8 @@ use crate::text;
use crate::touch;
use crate::widget::{self, Row, Text};
use crate::{
Alignment, Clipboard, Color, Element, Hasher, Layout, Length, Point,
Rectangle, Shell, Widget,
Alignment, Clipboard, Element, Hasher, Layout, Length, Point, Rectangle,
Shell, Widget,
};
pub use iced_style::checkbox::{Style, StyleSheet};
@ -43,7 +43,6 @@ pub struct Checkbox<'a, Message, Renderer: text::Renderer> {
spacing: u16,
text_size: Option<u16>,
font: Renderer::Font,
text_color: Option<Color>,
style_sheet: Box<dyn StyleSheet + 'a>,
}
@ -75,7 +74,6 @@ impl<'a, Message, Renderer: text::Renderer> Checkbox<'a, Message, Renderer> {
spacing: Self::DEFAULT_SPACING,
text_size: None,
font: Renderer::Font::default(),
text_color: None,
style_sheet: Default::default(),
}
}
@ -112,12 +110,6 @@ impl<'a, Message, Renderer: text::Renderer> Checkbox<'a, Message, Renderer> {
self
}
/// Sets the text color of the [`Checkbox`] button.
pub fn text_color(mut self, color: Color) -> Self {
self.text_color = Some(color);
self
}
/// Sets the style of the [`Checkbox`].
pub fn style(
mut self,
@ -264,7 +256,7 @@ where
&self.label,
self.font.clone(),
self.text_size,
self.text_color.or(Some(custom_style.text_color)),
custom_style.text_color,
alignment::Horizontal::Left,
alignment::Vertical::Center,
);