diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-09-25 16:36:52 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-09-25 16:36:52 +0000 |
| commit | faddffcf182e60b5ed41781e350dc1fddedb6fac (patch) | |
| tree | 01a0f22ec02fc64d076a87de287b83ee2df70f7c | |
| parent | 69dcc7c685455496ca9654e53e984bd4dec9fd6d (diff) | |
src/Fl_Button.cxx:
- Fl_Button::draw(): Only use fl_contrast() on the label
color when value() is non-zero.
src/fl_color.cxx:
- fl_contrast(): Require at least 1/3 (85) instead of 1/2
(127) for contrast against the background.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5489 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_Button.cxx | 2 | ||||
| -rw-r--r-- | src/fl_color.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx index a4e545f42..984ecf0a2 100644 --- a/src/Fl_Button.cxx +++ b/src/Fl_Button.cxx @@ -62,7 +62,7 @@ void Fl_Button::draw() { if (type() == FL_HIDDEN_BUTTON) return; Fl_Color col = value() ? selection_color() : color(); draw_box(value() ? (down_box()?down_box():fl_down(box())) : box(), col); - if (labeltype() == FL_NORMAL_LABEL) { + if (labeltype() == FL_NORMAL_LABEL && value()) { Fl_Color c = labelcolor(); labelcolor(fl_contrast(c, col)); draw_label(); diff --git a/src/fl_color.cxx b/src/fl_color.cxx index d2dcefb1c..999287468 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -378,8 +378,8 @@ Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg) { l2 = ((c2 >> 24) * 31 + ((c2 >> 16) & 255) * 61 + ((c2 >> 8) & 255) * 8) / 100; // Compare and return the contrasting color... - if ((l1 - l2) > 127) return fg; - else if ((l2 - l1) > 127) return fg; + if ((l1 - l2) > 85) return fg; + else if ((l2 - l1) > 85) return fg; else if (l2 > 127) return FL_BLACK; else return FL_WHITE; } |