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

Fixed processing of menu shortcuts for Fl_Sys_Menu_Bar

Browse Source 
in the case of an invisible item.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10106 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2014-02-19 16:02:56 +00:00
parent 1122c14443
commit dc80217531
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Fl_Sys_Menu_Bar.mm
View File

@ -470,8 +470,14 @@ void Fl_Sys_Menu_Bar::draw() {
static int process_sys_menu_shortcuts(int event) static int process_sys_menu_shortcuts(int event)
{ {
if (event != FL_SHORTCUT || !fl_sys_menu_bar || Fl::modal()) return 0; if (event != FL_SHORTCUT || !fl_sys_menu_bar || Fl::modal()) return 0;
// have the system menu process the shortcut, highlighting the corresponding menu if found // is the last event the shortcut of an item of the fl_sys_menu_bar menu ?
return [[NSApp mainMenu] performKeyEquivalent:[NSApp currentEvent]]; const Fl_Menu_Item *item = fl_sys_menu_bar->menu()->test_shortcut();
if (!item) return 0;
if (item->visible()) // have the system menu process the shortcut, highlighting the corresponding menu
[[NSApp mainMenu] performKeyEquivalent:[NSApp currentEvent]];
else // have FLTK process the shortcut associated to an invisible Fl_Menu_Item
fl_sys_menu_bar->picked(item);
return 1;
} }