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

5
browser/ui/atom_menu_controller_mac.mm
View file

@ -159,7 +159,12 @@ int EventFlagsFromNSEvent(NSEvent* event) {
ui::MenuModel* submenuModel = model->GetSubmenuModelAt(index);
NSMenu* submenu =
[self menuFromModel:(ui::SimpleMenuModel*)submenuModel];
[submenu setTitle:[item title]];
[item setSubmenu:submenu];
// Hack to set window menu.
if ([[item title] isEqualToString:@"Window"] && [submenu numberOfItems] > 0)
[NSApp setWindowsMenu:submenu];
} else {
// The MenuModel works on indexes so we can't just set the command id as the
// tag like we do in other menus. Also set the represented object to be