summaryrefslogtreecommitdiffstats
path: root/style/src/theme
diff options
context:
space:
mode:
authorLibravatar Clark Moody <clark@clarkmoody.com>2023-05-25 13:59:58 -0500
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-05-25 23:44:31 +0200
commit2d21d0900e9fcabfc01a7deaaab5b4fd4b8573e8 (patch)
tree67af0955eea6494e9a549253dcf49a7e06f1ebbd /style/src/theme
parentc61a4cc21ca4d5019cd10df2f316ebbdb24061f1 (diff)
downloadiced-2d21d0900e9fcabfc01a7deaaab5b4fd4b8573e8.tar.gz
iced-2d21d0900e9fcabfc01a7deaaab5b4fd4b8573e8.tar.bz2
iced-2d21d0900e9fcabfc01a7deaaab5b4fd4b8573e8.zip
Upgrade `palette` dependency
Diffstat (limited to 'style/src/theme')
-rw-r--r--style/src/theme/palette.rs22
1 files changed, 12 insertions, 10 deletions
diff --git a/style/src/theme/palette.rs b/style/src/theme/palette.rs
index 0f15494b..aaeb799d 100644
--- a/style/src/theme/palette.rs
+++ b/style/src/theme/palette.rs
@@ -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()
}