From 76ff9e14d8aacaa1efcf62edff55adeb00a7fdb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=CC=81s=CC=8C=20Znamena=CC=81c=CC=8Cek?= Date: Fri, 31 May 2019 17:02:06 +0200 Subject: [PATCH] Use NSEvent constants instead of hard-coded numbers, fixes #121 --- Framework/MASShortcut.m | 53 +++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/Framework/MASShortcut.m b/Framework/MASShortcut.m index ec1e7e0..5d84966 100644 --- a/Framework/MASShortcut.m +++ b/Framework/MASShortcut.m @@ -48,33 +48,34 @@ static NSString *const MASShortcutModifierFlags = @"ModifierFlags"; - (NSString *)keyCodeStringForKeyEquivalent { NSString *keyCodeString = self.keyCodeString; - if (keyCodeString.length > 1) { - switch (self.keyCode) { - case kVK_F1: return NSStringFromMASKeyCode(0xF704); - case kVK_F2: return NSStringFromMASKeyCode(0xF705); - case kVK_F3: return NSStringFromMASKeyCode(0xF706); - case kVK_F4: return NSStringFromMASKeyCode(0xF707); - case kVK_F5: return NSStringFromMASKeyCode(0xF708); - case kVK_F6: return NSStringFromMASKeyCode(0xF709); - case kVK_F7: return NSStringFromMASKeyCode(0xF70a); - case kVK_F8: return NSStringFromMASKeyCode(0xF70b); - case kVK_F9: return NSStringFromMASKeyCode(0xF70c); - case kVK_F10: return NSStringFromMASKeyCode(0xF70d); - case kVK_F11: return NSStringFromMASKeyCode(0xF70e); - case kVK_F12: return NSStringFromMASKeyCode(0xF70f); - // From this point down I am guessing F13 etc come sequentially, I don't have a keyboard to test. - case kVK_F13: return NSStringFromMASKeyCode(0xF710); - case kVK_F14: return NSStringFromMASKeyCode(0xF711); - case kVK_F15: return NSStringFromMASKeyCode(0xF712); - case kVK_F16: return NSStringFromMASKeyCode(0xF713); - case kVK_F17: return NSStringFromMASKeyCode(0xF714); - case kVK_F18: return NSStringFromMASKeyCode(0xF715); - case kVK_F19: return NSStringFromMASKeyCode(0xF716); - case kVK_Space: return NSStringFromMASKeyCode(0x20); - default: return @""; - } + + if (keyCodeString.length <= 1) { + return keyCodeString.lowercaseString; + } + + switch (self.keyCode) { + case kVK_F1: return NSStringFromMASKeyCode(NSF1FunctionKey); + case kVK_F2: return NSStringFromMASKeyCode(NSF2FunctionKey); + case kVK_F3: return NSStringFromMASKeyCode(NSF3FunctionKey); + case kVK_F4: return NSStringFromMASKeyCode(NSF4FunctionKey); + case kVK_F5: return NSStringFromMASKeyCode(NSF5FunctionKey); + case kVK_F6: return NSStringFromMASKeyCode(NSF6FunctionKey); + case kVK_F7: return NSStringFromMASKeyCode(NSF7FunctionKey); + case kVK_F8: return NSStringFromMASKeyCode(NSF8FunctionKey); + case kVK_F9: return NSStringFromMASKeyCode(NSF9FunctionKey); + case kVK_F10: return NSStringFromMASKeyCode(NSF10FunctionKey); + case kVK_F11: return NSStringFromMASKeyCode(NSF11FunctionKey); + case kVK_F12: return NSStringFromMASKeyCode(NSF12FunctionKey); + case kVK_F13: return NSStringFromMASKeyCode(NSF13FunctionKey); + case kVK_F14: return NSStringFromMASKeyCode(NSF14FunctionKey); + case kVK_F15: return NSStringFromMASKeyCode(NSF15FunctionKey); + case kVK_F16: return NSStringFromMASKeyCode(NSF16FunctionKey); + case kVK_F17: return NSStringFromMASKeyCode(NSF17FunctionKey); + case kVK_F18: return NSStringFromMASKeyCode(NSF18FunctionKey); + case kVK_F19: return NSStringFromMASKeyCode(NSF19FunctionKey); + case kVK_Space: return NSStringFromMASKeyCode(0x20); + default: return @""; } - return keyCodeString.lowercaseString; } - (NSString *)keyCodeString