Merge branch 'iced-rs:master' into master
This commit is contained in:
commit
4f41927155
104 changed files with 1105 additions and 726 deletions
|
|
@ -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"]
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue