diff options
| author | dannye <33dannye@gmail.com> | 2024-10-06 12:19:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-06 19:19:54 +0200 |
| commit | 5c6ec56b33d9eb5a9261eb72128d86f8e6ff5305 (patch) | |
| tree | b012a52280f23dbbec241a5e7d6af6d52ee08743 /src/Fl_MacOS_Sys_Menu_Bar.mm | |
| parent | 6e3b64425e2b6345a4ba1d14c3c88f85bfc7f1a0 (diff) | |
Submenus with no callback enter their submenu instead of closing the whole menu (#1043)
Thanks for those nice changes.
Diffstat (limited to 'src/Fl_MacOS_Sys_Menu_Bar.mm')
| -rw-r--r-- | src/Fl_MacOS_Sys_Menu_Bar.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index a7c5e2f20..950a52e29 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -378,7 +378,9 @@ static void createSubMenu( NSMenu *mh, pFl_Menu_Item &mm, const Fl_Menu_Item *m mm = mm->next(0); continue; } - miCnt = [FLMenuItem addNewItem:mm menu:submenu action:selector]; + miCnt = [FLMenuItem addNewItem:mm menu:submenu + action:( (mm->flags & (FL_SUBMENU+FL_SUBMENU_POINTER) && !mm->callback()) ? nil : selector) + ]; setMenuFlags( submenu, miCnt, mm ); setMenuShortcut( submenu, miCnt, mm ); if (mitem && (mm->flags & FL_MENU_INACTIVE || mitem->flags & FL_MENU_INACTIVE)) { |