diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2022-01-21 19:27:17 +0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-01-21 19:27:17 +0700 |
| commit | 04efd22dbaffbbb251c871aa7c1e81cdf31eb5f0 (patch) | |
| tree | 992ba4bdf00ff84f9d068d40375ef75d6596df9c /style | |
| parent | 5a1638add8c42bd444448e35dbbbbcc23ebaa4d2 (diff) | |
| parent | 93285d85b0413553286f8cc48cba4036260e5be1 (diff) | |
| download | iced-04efd22dbaffbbb251c871aa7c1e81cdf31eb5f0.tar.gz iced-04efd22dbaffbbb251c871aa7c1e81cdf31eb5f0.tar.bz2 iced-04efd22dbaffbbb251c871aa7c1e81cdf31eb5f0.zip | |
Merge pull request #1209 from iced-rs/checkbox-radio-text-color
Remove ambiguous `text_color` attributes for `Checkbox` and `Radio`
Diffstat (limited to 'style')
| -rw-r--r-- | style/src/checkbox.rs | 4 | ||||
| -rw-r--r-- | style/src/radio.rs | 2 |
2 files changed, 4 insertions, 2 deletions
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, } } |