projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
53afd7c
)
Ignore and stop listening if the key event has either Command or Alt modifier bits...
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Sun, 10 Mar 2013 21:52:01 +0000
(22:52 +0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Sun, 10 Mar 2013 21:52:01 +0000
(22:52 +0100)
Classes/NJKeyInputField.m
patch
|
blob
|
history
diff --git
a/Classes/NJKeyInputField.m
b/Classes/NJKeyInputField.m
index
c9b2f4d
..
814fdfe
100644
(file)
--- a/
Classes/NJKeyInputField.m
+++ b/
Classes/NJKeyInputField.m
@@
-173,25
+173,21
@@
CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
self.stringValue = [NJKeyInputField stringForKeyCode:keyCode];
}
self.stringValue = [NJKeyInputField stringForKeyCode:keyCode];
}
-- (void)keyDown:(NSEvent *)
theE
vent {
- if (!theEvent.isARepeat) {
- if ((theEvent.modifierFlags & NSAlternateKeyMask)
-
&& theE
vent.keyCode == 0x33) {
- // Allow Alt+Backspace to clear the field.
+- (void)keyDown:(NSEvent *)
e
vent {
+ static const NSUInteger IGNORE = NSAlternateKeyMask | NSCommandKeyMask;
+ if (!event.isARepeat) {
+
if ((event.modifierFlags & IGNORE) && e
vent.keyCode == 0x33) {
+ // Allow Alt
/Command
+Backspace 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 if (!(event.modifierFlags & IGNORE)) {
+ self.keyCode = event.keyCode;
+ [self.keyDelegate keyInputField:self didChangeKey:self.keyCode];
}
[self resignIfFirstResponder];
}
}
}
[self resignIfFirstResponder];
}
}
-
+
- (void)mouseDown:(NSEvent *)theEvent {
if (self.window.firstResponder == self)
[self.window makeFirstResponder:nil];
- (void)mouseDown:(NSEvent *)theEvent {
if (self.window.firstResponder == self)
[self.window makeFirstResponder:nil];