diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-26 00:50:16 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-26 00:50:16 +0000 |
| commit | 44b28b56efe6abc07b834d210eb603538ad7bf5c (patch) | |
| tree | 71d31cc86750343f68319a813ba8bea7abd1c6fd /src | |
| parent | 96d4075b520d61ee5414f282b177cee4b55b3a77 (diff) | |
Improve appearance of Fl_Choice when scheme is set to plastic.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2036 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Choice.cxx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index 8aca736ef..e593e9adc 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.7 2002/03/25 22:11:52 easysw Exp $" +// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.8 2002/03/26 00:50:16 easysw Exp $" // // Choice widget for the Fast Light Tool Kit (FLTK). // @@ -34,7 +34,6 @@ extern char fl_draw_shortcut; void Fl_Choice::draw() { - draw_box(FL_DOWN_BOX, color()); int dx = Fl::box_dx(FL_DOWN_BOX); int dy = Fl::box_dy(FL_DOWN_BOX); int H = h() - 2 * dy; @@ -45,10 +44,19 @@ void Fl_Choice::draw() { int x1 = X + (W - 2 * w1 - 1) / 2; int y1 = Y + (H - w1 - 1) / 2; - draw_box(FL_UP_BOX,X,Y,W,H,FL_GRAY); + if (Fl::scheme()) { + draw_box(FL_UP_BOX, color()); - fl_color(active_r() ? labelcolor() : fl_inactive(labelcolor())); - fl_polygon(x1, y1, x1 + w1, y1 + w1, x1 + 2 * w1, y1); + fl_color(active_r() ? labelcolor() : fl_inactive(labelcolor())); + fl_polygon(x1, y1 + 3, x1 + w1, y1 + w1 + 3, x1 + 2 * w1, y1 + 3); + fl_polygon(x1, y1 + 1, x1 + w1, y1 - w1 + 1, x1 + 2 * w1, y1 + 1); + } else { + draw_box(FL_DOWN_BOX, color()); + draw_box(FL_UP_BOX,X,Y,W,H,FL_GRAY); + + fl_color(active_r() ? labelcolor() : fl_inactive(labelcolor())); + fl_polygon(x1, y1, x1 + w1, y1 + w1, x1 + 2 * w1, y1); + } W += 2 * dx; @@ -62,6 +70,7 @@ void Fl_Choice::draw() { fl_draw_shortcut = 0; fl_pop_clip(); } + draw_label(); } @@ -119,5 +128,5 @@ int Fl_Choice::handle(int e) { } // -// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.7 2002/03/25 22:11:52 easysw Exp $". +// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.8 2002/03/26 00:50:16 easysw Exp $". // |