diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-04-10 00:54:51 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-04-10 00:54:51 +0000 |
| commit | 76d03987d5effc439bc9c6412a96ee5c4d5c6e93 (patch) | |
| tree | 1b1f77ad4898b7ddf95fd93ede3fb1902122503d /src | |
| parent | 616c919d3724b5ae142299de49e9706246ab0db7 (diff) | |
Fl_Menu now uses the boxtype to redraw the menu background (STR
#204)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3382 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Menu.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index fc3489c1d..2fb555d56 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.28 2003/11/01 01:49:35 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.29 2004/04/10 00:54:51 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -341,14 +341,9 @@ void menuwindow::drawentry(const Fl_Menu_Item* m, int n, int eraseit) { int hh = itemheight - LEADING; if (eraseit && n != selected) { - if (Fl::scheme()) { - fl_push_clip(xx+1, yy-(LEADING-2)/2, ww-2, hh+(LEADING-2)); - draw_box(box(), 0, 0, w(), h(), color()); - fl_pop_clip(); - } else { - fl_color(button ? button->color() : FL_GRAY); - fl_rectf(xx+1, yy-(LEADING-2)/2, ww-2, hh+(LEADING-2)); - } + fl_push_clip(xx+1, yy-(LEADING-2)/2, ww-2, hh+(LEADING-2)); + draw_box(box(), 0, 0, w(), h(), button ? button->color() : color()); + fl_pop_clip(); } m->draw(xx, yy, ww, hh, button, n==selected); @@ -794,5 +789,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.28 2003/11/01 01:49:35 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.29 2004/04/10 00:54:51 easysw Exp $". // |