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

fix: allow NSMenuItems to be disabled (#46307)

Browse source 
* fix: disable NSMenu autoenable feature to allow disabling of NSMenuItems

* style: fix linter issues and update comments

* chore: remove unneeded comment
This commit is contained in:
Hailey 2025-03-27 17:43:46 -07:00 • committed by GitHub
parent e09712f0e1
commit ac616ef41d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/ui/cocoa/electron_menu_controller.mm
View file

@ -320,6 +320,10 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:label NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:label
action:@selector(itemSelected:) action:@selector(itemSelected:)
keyEquivalent:@""]; keyEquivalent:@""];
if (model->IsEnabledAt(index))
[item setEnabled:YES];
else
[item setEnabled:NO];
// If the menu item has an icon, set it. // If the menu item has an icon, set it.
ui::ImageModel icon = model->GetIconAt(index); ui::ImageModel icon = model->GetIconAt(index);
@ -349,11 +353,6 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
[item setSubmenu:[self createShareMenuForItem:sharing_item]]; [item setSubmenu:[self createShareMenuForItem:sharing_item]];
} else if (type == electron::ElectronMenuModel::TYPE_SUBMENU && } else if (type == electron::ElectronMenuModel::TYPE_SUBMENU &&
model->IsVisibleAt(index)) { 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. // Recursively build a submenu from the sub-model at this index.
[item setTarget:nil]; [item setTarget:nil];
[item setAction:nil]; [item setAction:nil];
@ -493,8 +492,10 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
} }
- (NSMenu*)menu { - (NSMenu*)menu {
if (menu_) if (menu_) {
[menu_ setAutoenablesItems:NO];
return menu_; return menu_;
}
if (model_ && model_->sharing_item()) { if (model_ && model_->sharing_item()) {
NSMenu* menu = [self createShareMenuForItem:*model_->sharing_item()]; NSMenu* menu = [self createShareMenuForItem:*model_->sharing_item()];
@ -504,6 +505,8 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
if (model_) if (model_)
[self populateWithModel:model_.get()]; [self populateWithModel:model_.get()];
} }
[menu_ setAutoenablesItems:NO];
[menu_ setDelegate:self]; [menu_ setDelegate:self];
return menu_; return menu_;
} }