diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-14 17:32:25 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-14 17:32:25 +0000 |
| commit | 3b597088381e65057b5cbb9bc6d92667c58b36a7 (patch) | |
| tree | 754a716e0a9893973c18917e57d1c3ec9d532a37 /src | |
| parent | 04175702d8be709971f880530be3cb59f35334d1 (diff) | |
Fixed menu overlay bug.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2903 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Menu.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 046fa5d78..e0cb3ae4f 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.21 2002/11/19 16:37:35 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.22 2003/01/14 17:32:25 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -225,7 +225,7 @@ menutitle::menutitle(int X, int Y, int W, int H, const Fl_Menu_Item* L) : set_modal(); clear_border(); menu = L; - if (L->labelcolor_ || Fl::scheme()) clear_overlay(); + if (L->labelcolor_ || Fl::scheme() || L->labeltype_ > FL_NO_LABEL) clear_overlay(); } menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp, @@ -280,7 +280,7 @@ menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp, w1 = int(fl_width(fl_shortcut_label(m->shortcut_))) + 8; if (w1 > hotKeysw) hotKeysw = w1; } - if (m->labelcolor_ || Fl::scheme()) clear_overlay(); + if (m->labelcolor_ || Fl::scheme() || m->labeltype_ > FL_NO_LABEL) clear_overlay(); } if (selected >= 0 && !Wp) X -= W/2; int BW = Fl::box_dx(box()); @@ -784,5 +784,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.21 2002/11/19 16:37:35 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.22 2003/01/14 17:32:25 easysw Exp $". // |