mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed dismissing buttons in menu bars (STR #1494)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5605 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2007-01-18 09:30:04 +00:00
parent 08216b4fac
commit 5f0156cd02
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.8
- Fixed dismissing buttons in menu bars (STR #1494)
- Making a child group visible in a Fl_Tabs or Fl_Wizard
group now shows that tab or pane.
- Added fl_open_uri() function as proposed on

19
src/Fl_Menu.cxx
View File

@ -689,8 +689,23 @@ int menuwindow::early_hide_handle(int e) {
}
for (mymenu = pp.nummenus-1; ; mymenu--) {
item = pp.p[mymenu]->find_selected(mx, my);
if (item >= 0) break;
if (mymenu <= 0) return 0;
if (item >= 0)
break;
if (mymenu <= 0) {
// buttons in menubars must be deselected if we move outside of them!
if (pp.menu_number==-1 && e==FL_PUSH) {
pp.state = DONE_STATE;
return 1;
}
if (pp.current_item && pp.menu_number==0 && !pp.current_item->submenu()) {
if (e==FL_PUSH)
pp.state = DONE_STATE;
setitem(0, -1, 0);
return 1;
}
// all others can stay selected
return 0;
}
}
if (my == 0 && item > 0) setitem(mymenu, item - 1);
else setitem(mymenu, item);