From 29dbb93f16f5844345239c4c7d57d45563450981 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Tue, 13 Jun 2017 20:29:54 +1000 Subject: [PATCH 1/2] Don't mutate the accelerator character wuth the shift key if it's a number --- atom/browser/ui/accelerator_util_mac.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/atom/browser/ui/accelerator_util_mac.mm b/atom/browser/ui/accelerator_util_mac.mm index cf1d3de4d212..c10f4cb6ed4b 100644 --- a/atom/browser/ui/accelerator_util_mac.mm +++ b/atom/browser/ui/accelerator_util_mac.mm @@ -26,7 +26,13 @@ void SetPlatformAccelerator(ui::Accelerator* accelerator) { &characterIgnoringModifiers); if (character != characterIgnoringModifiers) { - modifiers ^= NSShiftKeyMask; + // 48 === '0', 57 === '9' + if (characterIgnoringModifiers >= 48 && characterIgnoringModifiers <= 57) { + // The character is a number so lets not mutate it with the modifiers + character = characterIgnoringModifiers; + } else { + modifiers ^= NSShiftKeyMask; + } } if (character == NSDeleteFunctionKey) { From 231d4f7581dea68a044e8a07179f3e207d1b93e8 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Sat, 17 Jun 2017 03:52:19 +1000 Subject: [PATCH 2/2] Use the isdigit helper --- atom/browser/ui/accelerator_util_mac.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/atom/browser/ui/accelerator_util_mac.mm b/atom/browser/ui/accelerator_util_mac.mm index c10f4cb6ed4b..f6107e684e96 100644 --- a/atom/browser/ui/accelerator_util_mac.mm +++ b/atom/browser/ui/accelerator_util_mac.mm @@ -26,8 +26,7 @@ void SetPlatformAccelerator(ui::Accelerator* accelerator) { &characterIgnoringModifiers); if (character != characterIgnoringModifiers) { - // 48 === '0', 57 === '9' - if (characterIgnoringModifiers >= 48 && characterIgnoringModifiers <= 57) { + if (isdigit(characterIgnoringModifiers)) { // The character is a number so lets not mutate it with the modifiers character = characterIgnoringModifiers; } else {