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

fix: don't construct submenu if it's invisible (#16834)

Browse source
This commit is contained in:
Shelley Vohr 2019-02-08 12:54:39 -08:00 committed by Samuel Attard
parent 833daaa2b2
commit 062778c031
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -220,7 +220,8 @@ static base::scoped_nsobject<NSMenu> recentDocumentsMenuSwap_;
NSMenu* submenu = [[NSMenu alloc] initWithTitle:label]; NSMenu* submenu = [[NSMenu alloc] initWithTitle:label];
[item setSubmenu:submenu]; [item setSubmenu:submenu];
[NSApp setServicesMenu:submenu]; [NSApp setServicesMenu:submenu];
} else if (type == atom::AtomMenuModel::TYPE_SUBMENU) { } else if (type == atom::AtomMenuModel::TYPE_SUBMENU &&
model->IsVisibleAt(index)) {
// Recursively build a submenu from the sub-model at this index. // Recursively build a submenu from the sub-model at this index.
[item setTarget:nil]; [item setTarget:nil];
[item setAction:nil]; [item setAction:nil];