diff options
| author |  Giuliano Bellini <100347457+GyulyVGC@users.noreply.github.com> | 2023-02-22 21:23:04 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-22 21:23:04 +0100 |
| commit | 4f41927155e7d4bc38497b0e298a0b23ccea6ca1 (patch) | |
| tree | 70b7dbc1afdc62dfeaf42f0c62e8f4c01e407729 /style | |
| parent | a35d6d2e4d59f71309f31c87ea5150959d639185 (diff) | |
| parent | 666f3cd143047e49a010f0c97eabc7136f92aa35 (diff) | |
| download | iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.tar.gz iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.tar.bz2 iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.zip | |
Merge branch 'iced-rs:master' into master
Diffstat (limited to '')
| -rw-r--r-- | style/Cargo.toml | 4 | ||||
| -rw-r--r-- | style/src/checkbox.rs | 4 | ||||
| -rw-r--r-- | style/src/theme.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/style/Cargo.toml b/style/Cargo.toml index 2be3e78d..3b54f1ec 100644 --- a/style/Cargo.toml +++ b/style/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iced_style" -version = "0.6.0" +version = "0.7.0" authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"] edition = "2021" description = "The default set of styles of Iced" @@ -11,7 +11,7 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"] categories = ["gui"] [dependencies.iced_core] -version = "0.7" +version = "0.8" path = "../core" features = ["palette"] 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 8d40bda1..1d262562 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, |