From faddffcf182e60b5ed41781e350dc1fddedb6fac Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 25 Sep 2006 16:36:52 +0000 Subject: 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 --- src/Fl_Button.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Fl_Button.cxx') 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(); -- cgit v1.2.3