diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-03-09 07:51:10 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-03-09 07:51:10 +0000 |
| commit | 84ad113a5b9c6078a32b52477977f4a99463d0dc (patch) | |
| tree | a0adbf294dad6a1308ee38b75637d586334d3a6c /src | |
| parent | 92ff32aa80dbccb9468bf96b5b0ccf5580805d64 (diff) | |
Fixes for FL_FILL_DIAL
git-svn-id: file:///fltk/svn/fltk/trunk@380 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Dial.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Fl_Dial.cxx b/src/Fl_Dial.cxx index 8dfc7a8c9..e8d9a91a8 100644 --- a/src/Fl_Dial.cxx +++ b/src/Fl_Dial.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Dial.cxx,v 1.9 1999/03/09 07:26:28 bill Exp $" +// "$Id: Fl_Dial.cxx,v 1.10 1999/03/09 07:51:10 bill Exp $" // // Circular dial widget for the Fast Light Tool Kit (FLTK). // @@ -29,10 +29,13 @@ #include <stdlib.h> #include <FL/math.h> +// For XForms compatability, all angles are measured with 0 being straight +// up and positive numbers going clockwise. + void Fl_Dial::angles(short a, short b) { a1=a; a2=b; - if (a2 < a1) a2 += 360; + if (a2 < a1) a2 += 360; // necessary for XForms compatability } void Fl_Dial::draw(int x, int y, int w, int h) { @@ -43,14 +46,13 @@ void Fl_Dial::draw(int x, int y, int w, int h) { h -= Fl::box_dh(box()); double angle = (a2-a1)*(value()-minimum())/(maximum()-minimum()) + a1; if (type() == FL_FILL_DIAL) { - double a = angle; if (a < 0) a = 0; // foo: draw this nicely in certain round box types int foo = (box() > _FL_ROUND_UP_BOX && Fl::box_dx(box())); if (foo) {x--; y--; w+=2; h+=2;} fl_color(color()); - fl_pie(x, y, w-1, h-1, (360-a1)+90, (360-a)+360+90); + fl_pie(x, y, w-1, h-1, 90-a1, 360+90-angle); fl_color(selection_color()); - fl_pie(x, y, w-1, h-1, (360-a1)+90, (360-a)+90); + fl_pie(x, y, w-1, h-1, 90-angle, 90-a1); if (foo) { fl_color(FL_BLACK); fl_arc(x, y, w, h, 0, 360); @@ -145,5 +147,5 @@ Fl_Dial::Fl_Dial(int x, int y, int w, int h, const char* l) } // -// End of "$Id: Fl_Dial.cxx,v 1.9 1999/03/09 07:26:28 bill Exp $". +// End of "$Id: Fl_Dial.cxx,v 1.10 1999/03/09 07:51:10 bill Exp $". // |