gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed menu overlay bug.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2903 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2003-01-14 17:32:25 +00:00
parent 04175702d8
commit 3b59708838
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.3
- Documentation updates.
- The menus incorrectly used the overlay visual when one
or more menu items contained an image. [SF Bug #653846]
- Changed some error messages to use Fl::error() instead
of fprintf()...
- Fl_Text_Buffer and Fl_Text_Display used free to free
@ -13,7 +15,7 @@ CHANGES IN FLTK 1.1.3
the corresponding based types for the image id and
mask to avoid this.
- The FLUID widget panel wasn't sorted, so keyboard
navigation was strange.
navigation was strange. [SF Bug #647069]
- Fl_Scroll didn't compute the location of labels to the
right or below when determining the area to erase.
- Added backward-compatibility macro for

8
src/Fl_Menu.cxx
View File

@ -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 $".
//