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

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 { - (NSMenu*)menu {
if (!menu_ && model_) { if (menu_)
menu_.reset([[self menuFromModel:model_] retain]); return menu_.get();
[menu_ setDelegate:self];
} menu_.reset([[NSMenu alloc] initWithTitle:@""]);
[menu_ setDelegate:self];
if (model_)
[self populateWithModel:model_];
return menu_.get(); return menu_.get();
} }