github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: Enable creating empty menu

Browse Source
This commit is contained in:
Cheng Zhao
2014-11-16 21:06:16 +08:00
parent 49ac363eef
commit af72842728
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
atom/browser/ui/cocoa/atom_menu_controller.mm
View File

@@ -251,10 +251,13 @@ int EventFlagsFromNSEvent(NSEvent* event) {
}
- (NSMenu*)menu {
if (!menu_ && model_) {
menu_.reset([[self menuFromModel:model_] retain]);
[menu_ setDelegate:self];
}
if (menu_)
return menu_.get();
menu_.reset([[NSMenu alloc] initWithTitle:@""]);
[menu_ setDelegate:self];
if (model_)
[self populateWithModel:model_];
return menu_.get();
}