diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-10-03 02:35:12 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-10-03 02:35:12 +0000 |
| commit | 7febae3f9e6f340f775eac5bee3e783fdd361aaa (patch) | |
| tree | 52e2b15a231fefb78c189971b7fae602cdd2ce59 /src/Fl_Light_Button.cxx | |
| parent | ad4a4ea0db2df3aa6befe601f48ec3f80434fe95 (diff) | |
Add GTK thin up/down box/frame types.
Update the GTK round up/down box types.
Update radio/check box drawing for gtk+ scheme.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5505 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Light_Button.cxx')
| -rw-r--r-- | src/Fl_Light_Button.cxx | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/Fl_Light_Button.cxx b/src/Fl_Light_Button.cxx index 14943419f..1fc5e0636 100644 --- a/src/Fl_Light_Button.cxx +++ b/src/Fl_Light_Button.cxx @@ -3,7 +3,7 @@ // // Lighted 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 @@ -59,7 +59,11 @@ void Fl_Light_Button::draw() { // Check box... draw_box(down_box(), x()+dx, y()+dy, W, W, FL_BACKGROUND2_COLOR); if (value()) { - fl_color(col); + if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) { + fl_color(FL_SELECTION_COLOR); + } else { + fl_color(col); + } int tx = x() + dx + 3; int tw = W - 6; int d1 = tw/3; @@ -76,12 +80,19 @@ void Fl_Light_Button::draw() { // Radio button... draw_box(down_box(), x()+dx, y()+dy, W, W, FL_BACKGROUND2_COLOR); if (value()) { - fl_color(col); int tW = (W - Fl::box_dw(down_box())) / 2 + 1; if ((W - tW) & 1) tW++; // Make sure difference is even to center int tdx = dx + (W - tW) / 2; int tdy = dy + (W - tW) / 2; + if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) { + fl_color(FL_SELECTION_COLOR); + tW --; + fl_pie(x() + tdx - 1, y() + tdy - 1, tW + 3, tW + 3, 0.0, 360.0); + fl_arc(x() + tdx - 1, y() + tdy - 1, tW + 3, tW + 3, 0.0, 360.0); + fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2)); + } else fl_color(col); + switch (tW) { // Larger circles draw fine... default : @@ -107,6 +118,11 @@ void Fl_Light_Button::draw() { fl_rectf(x() + tdx, y() + tdy, tW, tW); break; } + + if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) { + fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.5)); + fl_arc(x() + tdx, y() + tdy, tW + 1, tW + 1, 60.0, 180.0); + } else fl_color(col); } break; default : |