From 93285d85b0413553286f8cc48cba4036260e5be1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 20 Jan 2022 18:34:15 +0700
Subject: Remove ambiguous `text_color` attributes for `Checkbox` and `Radio`

Instead, always use a `StyleSheet`.
---
 native/src/widget/checkbox.rs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'native/src/widget/checkbox.rs')

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,
             );
-- 
cgit