summaryrefslogtreecommitdiffstats
path: root/core/src/theme
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-04-07 18:52:07 +0200
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-04-07 18:56:11 +0200
commitefa75607baa073aba333ab0bfdee1e490a016097 (patch)
tree2713afba8885e2626077f88d2c704cfec3a94f78 /core/src/theme
parent0a61bcf24c53f3206db213462946bf390c79a671 (diff)
downloadiced-efa75607baa073aba333ab0bfdee1e490a016097.tar.gz
iced-efa75607baa073aba333ab0bfdee1e490a016097.tar.bz2
iced-efa75607baa073aba333ab0bfdee1e490a016097.zip
Revert "Merge pull request #2376 from Davidster/fix_palette_readable_color_contrast"
This reverts commit 63042354fc51884098f88e240f73e689295df31c, reversing changes made to 31d1d5fecbef50fa319cabd5d4194f1e4aaefa21.
Diffstat (limited to 'core/src/theme')
-rw-r--r--core/src/theme/palette.rs12
1 files changed, 2 insertions, 10 deletions
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()
}
}