diff options
Diffstat (limited to 'src/Fl_Light_Button.cxx')
| -rw-r--r-- | src/Fl_Light_Button.cxx | 137 |
1 files changed, 65 insertions, 72 deletions
diff --git a/src/Fl_Light_Button.cxx b/src/Fl_Light_Button.cxx index 33ecbc116..4de85bc5f 100644 --- a/src/Fl_Light_Button.cxx +++ b/src/Fl_Light_Button.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Lighted button widget for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2015 by Bill Spitzak and others. @@ -9,11 +7,11 @@ // the file "COPYING" which should have been included with this file. If this // file is missing or damaged, see the license at: // -// http://www.fltk.org/COPYING.php +// https://www.fltk.org/COPYING.php // -// Please report all bugs and problems on the following page: +// Please see the following page on how to report bugs and issues: // -// http://www.fltk.org/str.php +// https://www.fltk.org/bugs.php // // Subclass of Fl_Button where the "box" indicates whether it is @@ -35,10 +33,10 @@ void Fl_Light_Button::draw() { fl_inactive(selection_color())) : color(); int W = labelsize(); - int bx = Fl::box_dx(box()); // box frame width - int dx = bx + 2; // relative position of check mark etc. - int dy = (h() - W) / 2; // neg. offset o.k. for vertical centering - int lx = 0; // relative label position (STR #3237) + int bx = Fl::box_dx(box()); // box frame width + int dx = bx + 2; // relative position of check mark etc. + int dy = (h() - W) / 2; // neg. offset o.k. for vertical centering + int lx = 0; // relative label position (STR #3237) if (down_box()) { // draw other down_box() styles: @@ -49,71 +47,71 @@ void Fl_Light_Button::draw() { case _FL_PLASTIC_UP_BOX : // Check box... draw_box(down_box(), x()+dx, y()+dy, W, W, FL_BACKGROUND2_COLOR); - if (value()) { - if (Fl::is_scheme("gtk+")) { - fl_color(FL_SELECTION_COLOR); - } else { - fl_color(col); - } - int tx = x() + dx + 3; - int tw = W - 6; - int d1 = tw/3; - int d2 = tw-d1; - int ty = y() + dy + (W+d2)/2-d1-2; - for (int n = 0; n < 3; n++, ty++) { - fl_line(tx, ty, tx+d1, ty+d1); - fl_line(tx+d1, ty+d1, tx+tw-1, ty+d1-d2+1); - } - } + if (value()) { + if (Fl::is_scheme("gtk+")) { + fl_color(FL_SELECTION_COLOR); + } else { + fl_color(col); + } + int tx = x() + dx + 3; + int tw = W - 6; + int d1 = tw/3; + int d2 = tw-d1; + int ty = y() + dy + (W+d2)/2-d1-2; + for (int n = 0; n < 3; n++, ty++) { + fl_line(tx, ty, tx+d1, ty+d1); + fl_line(tx+d1, ty+d1, tx+tw-1, ty+d1-d2+1); + } + } break; case _FL_ROUND_DOWN_BOX : case _FL_ROUND_UP_BOX : // Radio button... draw_box(down_box(), x()+dx, y()+dy, W, W, FL_BACKGROUND2_COLOR); - if (value()) { - 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::is_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_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2f)); - } else fl_color(col); - - switch (tW) { - // Larger circles draw fine... - default : + if (value()) { + 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::is_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_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2f)); + } else fl_color(col); + + switch (tW) { + // Larger circles draw fine... + default : fl_pie(x() + tdx, y() + tdy, tW, tW, 0.0, 360.0); - break; + break; // Small circles don't draw well on many systems... - case 6 : - fl_rectf(x() + tdx + 2, y() + tdy, tW - 4, tW); - fl_rectf(x() + tdx + 1, y() + tdy + 1, tW - 2, tW - 2); - fl_rectf(x() + tdx, y() + tdy + 2, tW, tW - 4); - break; - - case 5 : - case 4 : - case 3 : - fl_rectf(x() + tdx + 1, y() + tdy, tW - 2, tW); - fl_rectf(x() + tdx, y() + tdy + 1, tW, tW - 2); - break; - - case 2 : - case 1 : - fl_rectf(x() + tdx, y() + tdy, tW, tW); - break; - } - - if (Fl::is_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); - } - } + case 6 : + fl_rectf(x() + tdx + 2, y() + tdy, tW - 4, tW); + fl_rectf(x() + tdx + 1, y() + tdy + 1, tW - 2, tW - 2); + fl_rectf(x() + tdx, y() + tdy + 2, tW, tW - 4); + break; + + case 5 : + case 4 : + case 3 : + fl_rectf(x() + tdx + 1, y() + tdy, tW - 2, tW); + fl_rectf(x() + tdx, y() + tdy + 1, tW, tW - 2); + break; + + case 2 : + case 1 : + fl_rectf(x() + tdx, y() + tdy, tW, tW); + break; + } + + if (Fl::is_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); + } + } break; default : draw_box(down_box(), x()+dx, y()+dy, W, W, col); @@ -162,12 +160,7 @@ Fl_Light_Button::Fl_Light_Button(int X, int Y, int W, int H, const char* l) Fl_Radio_Light_Button::Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l) -: Fl_Light_Button(X,Y,W,H,l) +: Fl_Light_Button(X,Y,W,H,l) { type(FL_RADIO_BUTTON); } - - -// -// End of "$Id$". -// |