perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve sub-sub-menu handling

This commit is contained in:
Markus Gans 2015-12-12 00:50:59 +01:00
parent 700c10ef1f
commit 8099c16b57
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2015-12-12 Markus Gans <guru.mail@muenster.de>
* Improve sub-sub-menu handling
2015-12-10 Markus Gans <guru.mail@muenster.de> 2015-12-10 Markus Gans <guru.mail@muenster.de>
* PC encoding: Avoid to print ASCII sign 0x00..0x1f in xterm * PC encoding: Avoid to print ASCII sign 0x00..0x1f in xterm
* Newfont Bullet sign * Newfont Bullet sign

7
src/fmenu.cpp
View File

@ -290,8 +290,8 @@ bool FMenu::containsMenuStructure (int x, int y) const
if ( getGeometryGlobal().contains(x,y) ) if ( getGeometryGlobal().contains(x,y) )
return true; return true;
else if ( si && si->hasMenu() ) else if ( si && si->hasMenu() && open_sub_menu )
return si->getMenu()->getGeometryGlobal().contains(x,y); return si->getMenu()->containsMenuStructure(x,y);
else if ( item && item->getGeometryGlobal().contains(x,y) ) else if ( item && item->getGeometryGlobal().contains(x,y) )
return true; return true;
else else
@ -1207,6 +1207,7 @@ void FMenu::onMouseMove (FMouseEvent* ev)
setClickedWidget(open_sub_menu); setClickedWidget(open_sub_menu);
open_sub_menu->onMouseMove(_ev); open_sub_menu->onMouseMove(_ev);
delete _ev; delete _ev;
return;
} }
else if ( ! mouse_over_menu && mouse_over_supermenu ) else if ( ! mouse_over_menu && mouse_over_supermenu )
{ {
@ -1219,6 +1220,7 @@ void FMenu::onMouseMove (FMouseEvent* ev)
setClickedWidget(smenu); setClickedWidget(smenu);
smenu->onMouseMove(_ev); smenu->onMouseMove(_ev);
delete _ev; delete _ev;
return;
} }
else if ( mouse_over_menubar ) else if ( mouse_over_menubar )
{ {
@ -1233,6 +1235,7 @@ void FMenu::onMouseMove (FMouseEvent* ev)
mbar->mouse_down = true; mbar->mouse_down = true;
mbar->onMouseMove(_ev); mbar->onMouseMove(_ev);
delete _ev; delete _ev;
return;
} }
else if ( ! hasSelectedItem() && statusBar() && mouse_over_menu ) else if ( ! hasSelectedItem() && statusBar() && mouse_over_menu )
{ {