mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

🍎 only add sub menus to Window when they actually have menu items. fixes #3873

Browse source
This commit is contained in:
leethomas 2015-12-30 19:36:02 -08:00
parent d4de4505b8
commit eac2f6fec3
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/ui/cocoa/atom_menu_controller.mm
View file

@ -148,10 +148,11 @@ Role kRolesMap[] = {
// Set submenu's role. // Set submenu's role.
base::string16 role = model->GetRoleAt(index); base::string16 role = model->GetRoleAt(index);
if (role == base::ASCIIToUTF16("window")) if (role == base::ASCIIToUTF16("window") && [submenu numberOfItems])
[NSApp setWindowsMenu:submenu]; [NSApp setWindowsMenu:submenu];
else if (role == base::ASCIIToUTF16("help")) else if (role == base::ASCIIToUTF16("help"))
[NSApp setHelpMenu:submenu]; [NSApp setHelpMenu:submenu];
if (role == base::ASCIIToUTF16("services")) if (role == base::ASCIIToUTF16("services"))
[NSApp setServicesMenu:submenu]; [NSApp setServicesMenu:submenu];
} else { } else {