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

Fix titles of submenus in application menu.

Browse source
This commit is contained in:
Cheng Zhao 2013-05-16 14:39:12 +08:00
parent 937b811c8d
commit 995b9dacc9
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
browser/api/atom_api_menu_mac.h
View file

@ -26,6 +26,11 @@ class MenuMac : public Menu {
private: private:
friend class Menu; friend class Menu;
// The MenuController doesn't set title for menus, however it's required by
// application menu to show submenus correctly, fix it by iterating all
// submenus and set their titles.
static void FixMenuTitles(NSMenu* menu);
DISALLOW_COPY_AND_ASSIGN(MenuMac); DISALLOW_COPY_AND_ASSIGN(MenuMac);
}; };

11
browser/api/atom_api_menu_mac.mm
View file

@ -61,6 +61,16 @@ 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])
[[item submenu] setTitle:[item title]];
}
}
// static // static
v8::Handle<v8::Value> Menu::SetApplicationMenu(const v8::Arguments &args) { v8::Handle<v8::Value> Menu::SetApplicationMenu(const v8::Arguments &args) {
v8::HandleScope scope; v8::HandleScope scope;
@ -75,6 +85,7 @@ v8::Handle<v8::Value> Menu::SetApplicationMenu(const v8::Arguments &args) {
scoped_nsobject<MenuController> menu_controller( scoped_nsobject<MenuController> menu_controller(
[[MenuController alloc] initWithModel:menu->model_.get() [[MenuController alloc] initWithModel:menu->model_.get()
useWithPopUpButtonCell:NO]); useWithPopUpButtonCell:NO]);
MenuMac::FixMenuTitles([menu_controller menu]);
[NSApp setMainMenu:[menu_controller menu]]; [NSApp setMainMenu:[menu_controller menu]];
// Ensure the menu_controller_ is destroyed after main menu is set. // Ensure the menu_controller_ is destroyed after main menu is set.