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

Merge pull request #9743 from electron/number-accelerator-modifier

Browse source 
Don't mutate the accelerator character with the shift key if it's a number
This commit is contained in:
Kevin Sawicki 2017-06-26 11:20:52 -07:00 • committed by GitHub
commit bda21216e7
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/ui/accelerator_util_mac.mm
View file

@ -26,8 +26,13 @@ void SetPlatformAccelerator(ui::Accelerator* accelerator) {
&characterIgnoringModifiers); &characterIgnoringModifiers);
if (character != characterIgnoringModifiers) { if (character != characterIgnoringModifiers) {
if (isdigit(characterIgnoringModifiers)) {
// The character is a number so lets not mutate it with the modifiers
character = characterIgnoringModifiers;
} else {
modifiers ^= NSShiftKeyMask; modifiers ^= NSShiftKeyMask;
} }
}
if (character == NSDeleteFunctionKey) { if (character == NSDeleteFunctionKey) {
character = NSDeleteCharacter; character = NSDeleteCharacter;