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`.
---
 style/src/checkbox.rs | 4 ++--
 style/src/radio.rs    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'style')

diff --git a/style/src/checkbox.rs b/style/src/checkbox.rs
index 77aae42b..de52e548 100644
--- a/style/src/checkbox.rs
+++ b/style/src/checkbox.rs
@@ -6,10 +6,10 @@ use iced_core::{Background, Color};
 pub struct Style {
     pub background: Background,
     pub checkmark_color: Color,
-    pub text_color: Color,
     pub border_radius: f32,
     pub border_width: f32,
     pub border_color: Color,
+    pub text_color: Option<Color>,
 }
 
 /// A set of rules that dictate the style of a checkbox.
@@ -26,10 +26,10 @@ impl StyleSheet for Default {
         Style {
             background: Background::Color(Color::from_rgb(0.95, 0.95, 0.95)),
             checkmark_color: Color::from_rgb(0.3, 0.3, 0.3),
-            text_color: Color::BLACK,
             border_radius: 5.0,
             border_width: 1.0,
             border_color: Color::from_rgb(0.6, 0.6, 0.6),
+            text_color: None,
         }
     }
 
diff --git a/style/src/radio.rs b/style/src/radio.rs
index 6fb1cb6c..dab76ad8 100644
--- a/style/src/radio.rs
+++ b/style/src/radio.rs
@@ -8,6 +8,7 @@ pub struct Style {
     pub dot_color: Color,
     pub border_width: f32,
     pub border_color: Color,
+    pub text_color: Option<Color>,
 }
 
 /// A set of rules that dictate the style of a radio button.
@@ -26,6 +27,7 @@ impl StyleSheet for Default {
             dot_color: Color::from_rgb(0.3, 0.3, 0.3),
             border_width: 1.0,
             border_color: Color::from_rgb(0.6, 0.6, 0.6),
+            text_color: None,
         }
     }
 
-- 
cgit