From 27568cfa1c948ba536e03519372b38412adec756 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 20 Mar 2007 09:52:51 +0000 Subject: Better contrast (#1625) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5748 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_color.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/fl_color.cxx b/src/fl_color.cxx index 7ccb14ed4..d39b0d895 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -374,12 +374,12 @@ Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg) { else c2 = fl_cmap[bg]; // Compute the luminosity... - l1 = ((c1 >> 24) * 31 + ((c1 >> 16) & 255) * 61 + ((c1 >> 8) & 255) * 8) / 100; - l2 = ((c2 >> 24) * 31 + ((c2 >> 16) & 255) * 61 + ((c2 >> 8) & 255) * 8) / 100; + l1 = ((c1 >> 24) * 30 + ((c1 >> 16) & 255) * 59 + ((c1 >> 8) & 255) * 11) / 100; + l2 = ((c2 >> 24) * 30 + ((c2 >> 16) & 255) * 59 + ((c2 >> 8) & 255) * 11) / 100; // Compare and return the contrasting color... - if ((l1 - l2) > 90) return fg; - else if ((l2 - l1) > 90) return fg; + if ((l1 - l2) > 96) return fg; + else if ((l2 - l1) > 96) return fg; else if (l2 > 127) return FL_BLACK; else return FL_WHITE; } -- cgit v1.2.3