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

Small optimization

Browse source
This commit is contained in:
Zhuo Lu 2017-11-20 16:29:16 -08:00 • committed by Cheng Zhao
parent 3e6e327711
commit cf73fb737f
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/ui/cocoa/atom_menu_controller.mm
View file

@ -189,7 +189,6 @@ NSMenu* swapMenu_;
fromModel:(atom::AtomMenuModel*)model { fromModel:(atom::AtomMenuModel*)model {
base::string16 label16 = model->GetLabelAt(index); base::string16 label16 = model->GetLabelAt(index);
NSString* label = l10n_util::FixUpWindowsStyleLabel(label16); NSString* label = l10n_util::FixUpWindowsStyleLabel(label16);
base::string16 role = model->GetRoleAt(index);
base::scoped_nsobject<NSMenuItem> item( base::scoped_nsobject<NSMenuItem> item(
[[NSMenuItem alloc] initWithTitle:label [[NSMenuItem alloc] initWithTitle:label
@ -201,6 +200,7 @@ NSMenu* swapMenu_;
if (model->GetIconAt(index, &icon) && !icon.IsEmpty()) if (model->GetIconAt(index, &icon) && !icon.IsEmpty())
[item setImage:icon.ToNSImage()]; [item setImage:icon.ToNSImage()];
base::string16 role = model->GetRoleAt(index);
atom::AtomMenuModel::ItemType type = model->GetTypeAt(index); atom::AtomMenuModel::ItemType type = model->GetTypeAt(index);
if (type == atom::AtomMenuModel::TYPE_SUBMENU) { if (type == atom::AtomMenuModel::TYPE_SUBMENU) {
// Recursively build a submenu from the sub-model at this index. // Recursively build a submenu from the sub-model at this index.
@ -244,7 +244,6 @@ NSMenu* swapMenu_;
} }
// Set menu item's role. // Set menu item's role.
base::string16 role = model->GetRoleAt(index);
[item setTarget:self]; [item setTarget:self];
if (!role.empty()) { if (!role.empty()) {
for (const Role& pair : kRolesMap) { for (const Role& pair : kRolesMap) {