From efa75607baa073aba333ab0bfdee1e490a016097 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 7 Apr 2024 18:52:07 +0200 Subject: Revert "Merge pull request #2376 from Davidster/fix_palette_readable_color_contrast" This reverts commit 63042354fc51884098f88e240f73e689295df31c, reversing changes made to 31d1d5fecbef50fa319cabd5d4194f1e4aaefa21. --- core/src/theme/palette.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'core/src/theme') diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs index 91543567..ca91c248 100644 --- a/core/src/theme/palette.rs +++ b/core/src/theme/palette.rs @@ -612,19 +612,11 @@ fn mix(a: Color, b: Color, factor: f32) -> Color { fn readable(background: Color, text: Color) -> Color { if is_readable(background, text) { - return text; - } - - let fallback = if is_dark(background) { + text + } else if is_dark(background) { Color::WHITE } else { Color::BLACK - }; - - if is_readable(background, fallback) { - fallback - } else { - fallback.inverse() } } -- cgit