summaryrefslogtreecommitdiffstats
path: root/native/src/widget/checkbox.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-01-20 18:34:15 +0700
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-01-20 18:34:15 +0700
commit93285d85b0413553286f8cc48cba4036260e5be1 (patch)
tree900fa17b6d81a5dc15ffdb29507c3fe15e9c99d6 /native/src/widget/checkbox.rs
parenta3744ec97a462557ab9a3d2509f02263f425fd28 (diff)
downloadiced-93285d85b0413553286f8cc48cba4036260e5be1.tar.gz
iced-93285d85b0413553286f8cc48cba4036260e5be1.tar.bz2
iced-93285d85b0413553286f8cc48cba4036260e5be1.zip
Remove ambiguous `text_color` attributes for `Checkbox` and `Radio`
Instead, always use a `StyleSheet`.
Diffstat (limited to 'native/src/widget/checkbox.rs')
-rw-r--r--native/src/widget/checkbox.rs14
1 files changed, 3 insertions, 11 deletions
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index a314140c..fff65a40 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -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,
);