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

[Mac] Move the FixMenuTitles hack to MenuController.

Browse source
This commit is contained in:
Cheng Zhao 2013-08-14 22:33:18 +08:00
parent 22012d41d8
commit f908619630
3 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
browser/api/atom_api_menu_mac.mm
View file

@ -62,22 +62,6 @@ void MenuMac::Popup(NativeWindow* native_window) {
}
}
// static
void MenuMac::FixMenuTitles(NSMenu* menu) {
int size = [menu numberOfItems];
for (int i = 0; i < size; ++i) {
NSMenuItem* item = [menu itemAtIndex:i];
if ([item hasSubmenu]) {
NSString* title = [item title];
NSMenu* submenu = [item submenu];
[submenu setTitle:title];
if ([title isEqualToString:@"Window"] && [submenu numberOfItems] > 0)
[NSApp setWindowsMenu:submenu];
}
}
}
// static
void MenuMac::SendActionToFirstResponder(const std::string& action) {
SEL selector = NSSelectorFromString(base::SysUTF8ToNSString(action));
@ -100,7 +84,6 @@ v8::Handle<v8::Value> Menu::SetApplicationMenu(const v8::Arguments &args) {
scoped_nsobject<AtomMenuController> menu_controller(
[[AtomMenuController alloc] initWithModel:menu->model_.get()
useWithPopUpButtonCell:NO]);
MenuMac::FixMenuTitles([menu_controller menu]);
[NSApp setMainMenu:[menu_controller menu]];
// Ensure the menu_controller_ is destroyed after main menu is set.