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

Remove PlatformAccelerator

Browse source 
1140211
This commit is contained in:
Jeremy Apthorp 2018-10-02 15:22:48 -07:00
parent 7ce338e420
commit b57b342352
6 changed files with 6 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -239,14 +239,12 @@ static base::scoped_nsobject<NSMenu> recentDocumentsMenuSwap_;
ui::Accelerator accelerator;
if (model->GetAcceleratorAtWithParams(index, useDefaultAccelerator_,
&accelerator)) {
const ui::PlatformAcceleratorCocoa* platformAccelerator =
static_cast<const ui::PlatformAcceleratorCocoa*>(
accelerator.platform_accelerator());
if (platformAccelerator) {
[item setKeyEquivalent:platformAccelerator->characters()];
[item
setKeyEquivalentModifierMask:platformAccelerator->modifier_mask()];
}
NSString* key_equivalent;
NSUInteger modifier_mask;
GetKeyEquivalentAndModifierMaskFromAccelerator(
accelerator, &key_equivalent, &modifier_mask);
[item setKeyEquivalent:key_equivalent];
[item setKeyEquivalentModifierMask:modifier_mask];
}
// Set menu item's role.