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

fix: enable property having no effect on submenus (#16835)

Browse source
This commit is contained in:
Shelley Vohr 2019-02-08 18:07:08 -08:00 • committed by GitHub
parent d16b581140
commit 1898f91620
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,6 +246,11 @@ static base::scoped_nsobject<NSMenu> recentDocumentsMenuSwap_;
[NSApp setServicesMenu:submenu];
} else if (type == atom::AtomMenuModel::TYPE_SUBMENU &&
model->IsVisibleAt(index)) {
// We need to specifically check that the submenu top-level item has been
// enabled as it's not validated by validateUserInterfaceItem
if (!model->IsEnabledAt(index))
[item setEnabled:NO];
// Recursively build a submenu from the sub-model at this index.
[item setTarget:nil];
[item setAction:nil];