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

Fix menubar menu clicking, so that menu items work again and clicking outside

Browse Source 
the menu cancels it.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4766 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2006-01-17 21:04:55 +00:00
parent 826eb45715
commit db822d2fd9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Fl_Menu.cxx
View File

@ -588,16 +588,18 @@ int menuwindow::handle(int e) {
case FL_PUSH:
case FL_DRAG: {
#ifdef __QNX__
// STR 704: workaround QNX X11 bug - in QNX an event FL_MOVE is sent
// STR 704: workaround QNX X11 bug - in QNX a FL_MOVE event is sent
// right after FL_RELEASE...
if (pp.state == DONE_STATE) return 1;
#endif // __QNX__
int mx = Fl::event_x_root();
int my = Fl::event_y_root();
int item=0; int mymenu;
if (e == FL_PUSH &&
(mx < x() || mx >= (x() + w()) ||
my < y() || my >= (y() + h()))) {
int item=0; int mymenu = pp.nummenus-1;
if (e == FL_PUSH && (!pp.menubar || mymenu) &&
(mx < pp.p[mymenu]->x_root() ||
mx >= (pp.p[mymenu]->x_root() + pp.p[mymenu]->w()) ||
my < pp.p[mymenu]->y_root() ||
my >= (pp.p[mymenu]->y_root() + pp.p[mymenu]->h()))) {
// Clicking outside menu cancels it...
setitem(0, -1, 0);
pp.state = DONE_STATE;