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

Use Lch to choose white text when not readable in theme::palette

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-04-07 19:32:49 +02:00
parent efa75607ba
commit ee86aea7f2
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/theme/palette.rs
View file

@ -4,7 +4,7 @@ use crate::{color, Color};
use once_cell::sync::Lazy;
use palette::color_difference::Wcag21RelativeContrast;
use palette::rgb::Rgb;
use palette::{FromColor, Hsl, Mix};
use palette::{FromColor, Hsl, Lch, Mix};
/// A color palette.
#[derive(Debug, Clone, Copy, PartialEq)]
@ -613,7 +613,7 @@ fn mix(a: Color, b: Color, factor: f32) -> Color {
fn readable(background: Color, text: Color) -> Color {
if is_readable(background, text) {
text
} else if is_dark(background) {
} else if to_lch(background).l < 70.0 {
Color::WHITE
} else {
Color::BLACK
@ -635,6 +635,10 @@ fn to_hsl(color: Color) -> Hsl {
Hsl::from_color(Rgb::from(color))
}
fn to_lch(color: Color) -> Lch {
Lch::from_color(Rgb::from(color))
}
fn from_hsl(hsl: Hsl) -> Color {
Rgb::from_color(hsl).into()
}