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

Upgrade palette dependency

Browse source
This commit is contained in:
Clark Moody 2023-05-25 13:59:58 -05:00 • committed by Héctor Ramón Jiménez
parent c61a4cc21c
commit 2d21d0900e
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
6 changed files with 63 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
style/Cargo.toml
View file

@ -16,7 +16,7 @@ path = "../core"
features = ["palette"]
[dependencies.palette]
version = "0.6"
version = "0.7"
[dependencies.once_cell]
version = "1.15"

22
style/src/theme/palette.rs
View file

@ -2,7 +2,9 @@
use iced_core::Color;
use once_cell::sync::Lazy;
use palette::{FromColor, Hsl, Mix, RelativeContrast, Srgb};
use palette::color_difference::Wcag21RelativeContrast;
use palette::rgb::Rgb;
use palette::{FromColor, Hsl, Mix};
/// A color palette.
#[derive(Debug, Clone, Copy, PartialEq)]
@ -298,11 +300,11 @@ fn deviate(color: Color, amount: f32) -> Color {
}
fn mix(a: Color, b: Color, factor: f32) -> Color {
let a_lin = Srgb::from(a).into_linear();
let b_lin = Srgb::from(b).into_linear();
let a_lin = Rgb::from(a).into_linear();
let b_lin = Rgb::from(b).into_linear();
let mixed = a_lin.mix(&b_lin, factor);
Srgb::from_linear(mixed).into()
let mixed = a_lin.mix(b_lin, factor);
Rgb::from_linear(mixed).into()
}
fn readable(background: Color, text: Color) -> Color {
@ -320,16 +322,16 @@ fn is_dark(color: Color) -> bool {
}
fn is_readable(a: Color, b: Color) -> bool {
let a_srgb = Srgb::from(a);
let b_srgb = Srgb::from(b);
let a_srgb = Rgb::from(a);
let b_srgb = Rgb::from(b);
a_srgb.has_enhanced_contrast_text(&b_srgb)
a_srgb.has_enhanced_contrast_text(b_srgb)
}
fn to_hsl(color: Color) -> Hsl {
Hsl::from_color(Srgb::from(color))
Hsl::from_color(Rgb::from(color))
}
fn from_hsl(hsl: Hsl) -> Color {
Srgb::from_color(hsl).into()
Rgb::from_color(hsl).into()
}