Support magic @Application token for automatic mapping names. Fall back to the bundle...

[enjoyable.git] / NJKeyInputField.m

diff --git a/NJKeyInputField.m b/NJKeyInputField.m
index 13aa138..ec08150 100644 (file)
--- a/NJKeyInputField.m
+++ b/NJKeyInputField.m
@@ -27,7 +27,7 @@ CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
 }
 
 - (BOOL)hasKeyCode {
-    return self.keyCode >= 0;
+    return self.keyCode != NJKeyInputFieldEmpty;
 }
 
 + (NSString *)stringForKeyCode:(CGKeyCode)keyCode {
@@ -176,10 +176,14 @@ CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
 - (void)keyDown:(NSEvent *)theEvent {
     if (!theEvent.isARepeat) {
         if ((theEvent.modifierFlags & NSAlternateKeyMask)
-            && theEvent.keyCode == 0x35) {
-            // Allow Alt+Escape to clear the field.
+            && theEvent.keyCode == 0x33) {
+            // Allow Alt+Backspace to clear the field.
             self.keyCode = NJKeyInputFieldEmpty;
             [self.keyDelegate keyInputFieldDidClear:self];
+        } else if ((theEvent.modifierFlags & NSAlternateKeyMask)
+                && theEvent.keyCode == 0x35) {
+                // Allow Alt+Escape to cancel.
+            ;
         } else {
             self.keyCode = theEvent.keyCode;
             [self.keyDelegate keyInputField:self didChangeKey:_keyCode];