projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bad Markdown.
[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 {
}
- (BOOL)hasKeyCode {
- return self.keyCode
>= 0
;
+ return self.keyCode
!= NJKeyInputFieldEmpty
;
}
+ (NSString *)stringForKeyCode:(CGKeyCode)keyCode {
}
+ (NSString *)stringForKeyCode:(CGKeyCode)keyCode {
@@
-176,10
+176,14
@@
CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
- (void)keyDown:(NSEvent *)theEvent {
if (!theEvent.isARepeat) {
if ((theEvent.modifierFlags & NSAlternateKeyMask)
- (void)keyDown:(NSEvent *)theEvent {
if (!theEvent.isARepeat) {
if ((theEvent.modifierFlags & NSAlternateKeyMask)
- && theEvent.keyCode == 0x3
5
) {
- // Allow Alt+
Escap
e to clear the field.
+ && theEvent.keyCode == 0x3
3
) {
+ // Allow Alt+
Backspac
e to clear the field.
self.keyCode = NJKeyInputFieldEmpty;
[self.keyDelegate keyInputFieldDidClear:self];
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];
} else {
self.keyCode = theEvent.keyCode;
[self.keyDelegate keyInputField:self didChangeKey:_keyCode];