diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-09-17 14:58:25 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-09-17 14:58:25 +0000 |
| commit | b4c1d3ef03084496a1899ba116ddcc7f6e5647c8 (patch) | |
| tree | 6f3360c7f796a013e0ea0b1cb1ddb4b1744c8ab9 /src/Fl_Button.cxx | |
| parent | d63cf6e3153f6be5ef6586588cdbaf53e1ff532c (diff) | |
Implement new "gtk+" scheme which provides a Bluecurve look-n-feel.
Fix size and position of dialog controls in FLUID to match the HIG.
Add "GTK+" scheme to the list of selectable schemes in FLUID.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5438 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Button.cxx')
| -rw-r--r-- | src/Fl_Button.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx index 8a4536de0..7ba692162 100644 --- a/src/Fl_Button.cxx +++ b/src/Fl_Button.cxx @@ -3,7 +3,7 @@ // // Button widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -60,9 +60,13 @@ void Fl_Button::setonly() { // set this radio button on, turn others off void Fl_Button::draw() { if (type() == FL_HIDDEN_BUTTON) return; Fl_Color col = value() ? selection_color() : color(); -//if (col == FL_GRAY && Fl::belowmouse()==this) col = FL_LIGHT1; draw_box(value() ? (down_box()?down_box():fl_down(box())) : box(), col); - draw_label(); + if (labeltype() == FL_NORMAL_LABEL) { + Fl_Color c = labelcolor(); + labelcolor(fl_contrast(c, col)); + draw_label(); + labelcolor(c); + } else draw_label(); if (Fl::focus() == this) draw_focus(); } |