X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=NJKeyInputField.m;h=ec081505c13ce92a28b411617d7ac2c479d16aec;hp=13aa138beb2baebe053568cc529c56e97ff429ca;hb=bf62b06504aeb5d111735f4a0f40b1b3f9e9e350;hpb=4a490c57151dd4ba9cb27cc34a0e33fc68fc4d24 diff --git a/NJKeyInputField.m b/NJKeyInputField.m index 13aa138..ec08150 100644 --- 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];