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

Fix inconsistent styling for Radio and Checkbox

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-07-08 20:23:38 +02:00
parent 3514bd1535
commit 3e643a9d6b
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
style/src/theme.rs
View file

@ -171,21 +171,25 @@ impl checkbox::StyleSheet for Theme {
match style { match style {
Checkbox::Primary => checkbox_appearance( Checkbox::Primary => checkbox_appearance(
palette.primary.strong.text,
palette.background.base, palette.background.base,
palette.primary.strong, palette.primary.strong,
is_checked, is_checked,
), ),
Checkbox::Secondary => checkbox_appearance( Checkbox::Secondary => checkbox_appearance(
palette.background.base.text,
palette.background.base, palette.background.base,
palette.background.base, palette.background.base,
is_checked, is_checked,
), ),
Checkbox::Success => checkbox_appearance( Checkbox::Success => checkbox_appearance(
palette.success.base.text,
palette.background.base, palette.background.base,
palette.success.base, palette.success.base,
is_checked, is_checked,
), ),
Checkbox::Danger => checkbox_appearance( Checkbox::Danger => checkbox_appearance(
palette.danger.base.text,
palette.background.base, palette.background.base,
palette.danger.base, palette.danger.base,
is_checked, is_checked,
@ -202,21 +206,25 @@ impl checkbox::StyleSheet for Theme {
match style { match style {
Checkbox::Primary => checkbox_appearance( Checkbox::Primary => checkbox_appearance(
palette.primary.strong.text,
palette.background.weak, palette.background.weak,
palette.primary.base, palette.primary.base,
is_checked, is_checked,
), ),
Checkbox::Secondary => checkbox_appearance( Checkbox::Secondary => checkbox_appearance(
palette.background.base.text,
palette.background.weak, palette.background.weak,
palette.background.base, palette.background.base,
is_checked, is_checked,
), ),
Checkbox::Success => checkbox_appearance( Checkbox::Success => checkbox_appearance(
palette.success.base.text,
palette.background.weak, palette.background.weak,
palette.success.base, palette.success.base,
is_checked, is_checked,
), ),
Checkbox::Danger => checkbox_appearance( Checkbox::Danger => checkbox_appearance(
palette.danger.base.text,
palette.background.weak, palette.background.weak,
palette.danger.base, palette.danger.base,
is_checked, is_checked,
@ -226,6 +234,7 @@ impl checkbox::StyleSheet for Theme {
} }
fn checkbox_appearance( fn checkbox_appearance(
checkmark_color: Color,
base: palette::Pair, base: palette::Pair,
accent: palette::Pair, accent: palette::Pair,
is_checked: bool, is_checked: bool,
@ -236,7 +245,7 @@ fn checkbox_appearance(
} else { } else {
base.color base.color
}), }),
checkmark_color: accent.text, checkmark_color,
border_radius: 2.0, border_radius: 2.0,
border_width: 1.0, border_width: 1.0,
border_color: accent.color, border_color: accent.color,
@ -422,7 +431,7 @@ impl radio::StyleSheet for Theme {
let palette = self.extended_palette(); let palette = self.extended_palette();
radio::Appearance { radio::Appearance {
dot_color: palette.primary.weak.text.into(), dot_color: palette.primary.strong.color.into(),
background: palette.primary.weak.color.into(), background: palette.primary.weak.color.into(),
..active ..active
} }