diff options
| author |  Bingus <shankern@protonmail.com> | 2023-02-17 11:45:34 -0800 |
|---|---|---|
| committer | Bingus <shankern@protonmail.com> | 2023-02-17 11:45:34 -0800 |
| commit | 744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch) | |
| tree | f88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /style | |
| parent | 8da098330b58542cc929f4f24d02e26bd654bae4 (diff) | |
| parent | 7dc1fb488ddbd12519571b51d75ae0c28875911d (diff) | |
| download | iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.gz iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.bz2 iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.zip | |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# winit/src/window.rs
Diffstat (limited to '')
| -rw-r--r-- | style/src/checkbox.rs | 4 | ||||
| -rw-r--r-- | style/src/theme.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/style/src/checkbox.rs b/style/src/checkbox.rs index 827b3225..52b90ec9 100644 --- a/style/src/checkbox.rs +++ b/style/src/checkbox.rs @@ -6,8 +6,8 @@ use iced_core::{Background, Color}; pub struct Appearance { /// The [`Background`] of the checkbox. pub background: Background, - /// The checkmark [`Color`] of the checkbox. - pub checkmark_color: Color, + /// The icon [`Color`] of the checkbox. + pub icon_color: Color, /// The border radius of the checkbox. pub border_radius: f32, /// The border width of the checkbox. diff --git a/style/src/theme.rs b/style/src/theme.rs index 55bfa4ca..4ba4facf 100644 --- a/style/src/theme.rs +++ b/style/src/theme.rs @@ -320,7 +320,7 @@ impl checkbox::StyleSheet for Theme { } fn checkbox_appearance( - checkmark_color: Color, + icon_color: Color, base: palette::Pair, accent: palette::Pair, is_checked: bool, @@ -331,7 +331,7 @@ fn checkbox_appearance( } else { base.color }), - checkmark_color, + icon_color, border_radius: 2.0, border_width: 1.0, border_color: accent.color, |