summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector@hecrj.dev>2024-04-07 08:36:59 +0200
committerLibravatar GitHub <noreply@github.com>2024-04-07 08:36:59 +0200
commit63042354fc51884098f88e240f73e689295df31c (patch)
tree20014290d1ae706b9db3d4609215a6a32f64120d
parent31d1d5fecbef50fa319cabd5d4194f1e4aaefa21 (diff)
parentc45c79b5d6e25f73dc76a816c08a7041ad971c66 (diff)
downloadiced-63042354fc51884098f88e240f73e689295df31c.tar.gz
iced-63042354fc51884098f88e240f73e689295df31c.tar.bz2
iced-63042354fc51884098f88e240f73e689295df31c.zip
Merge pull request #2376 from Davidster/fix_palette_readable_color_contrast
Add stronger guarantee of readability/contrast for palette background/text color pairs
-rw-r--r--core/src/theme/palette.rs12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index ca91c248..91543567 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -612,11 +612,19 @@ 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) {
+ return text;
+ }
+
+ let fallback = if is_dark(background) {
Color::WHITE
} else {
Color::BLACK
+ };
+
+ if is_readable(background, fallback) {
+ fallback
+ } else {
+ fallback.inverse()
}
}