projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused field.
[enjoyable.git]
/
KeyInputTextView.m
diff --git
a/KeyInputTextView.m
b/KeyInputTextView.m
index 1bb79521fc1eda6d15817ad4b0fe98254d564a29..91a2a3453d797d1f2a1494469e16cddbf2166f43 100644
(file)
--- a/
KeyInputTextView.m
+++ b/
KeyInputTextView.m
@@
-25,6
+25,8
@@
- (void)clear {
self.vk = -1;
- (void)clear {
self.vk = -1;
+ [targetController keyChanged];
+ [self resignIfFirstResponder];
}
- (BOOL)hasKey {
}
- (BOOL)hasKey {
@@
-168,15
+170,9
@@
return [super resignFirstResponder];
}
return [super resignFirstResponder];
}
-- (void)setBackgroundColor:(NSColor *)color {
- [super setBackgroundColor:color];
-}
-
- (void)setVk:(int)key {
vk = key;
[self setStringValue:[KeyInputTextView stringForKeyCode:key]];
- (void)setVk:(int)key {
vk = key;
[self setStringValue:[KeyInputTextView stringForKeyCode:key]];
- if (self.hasKey)
- [targetController keyChanged];
}
- (int)vk {
}
- (int)vk {
@@
-186,20
+182,27
@@
- (void)keyDown:(NSEvent *)evt {
if (!evt.isARepeat) {
self.vk = evt.keyCode;
- (void)keyDown:(NSEvent *)evt {
if (!evt.isARepeat) {
self.vk = evt.keyCode;
- [self.window makeFirstResponder:nil];
+ [targetController keyChanged];
+ [self resignIfFirstResponder];
}
}
}
}
+- (void)mouseDown:(NSEvent *)theEvent {
+ [targetController keyChanged];
+ [self.window makeFirstResponder:self];
+}
+
- (void)flagsChanged:(NSEvent *)evt {
self.vk = evt.keyCode;
- (void)flagsChanged:(NSEvent *)evt {
self.vk = evt.keyCode;
- [[self window] makeFirstResponder:nil];
+ [targetController keyChanged];
+ [self resignIfFirstResponder];
}
- (void)setEnabled:(BOOL)newEnabled {
enabled = newEnabled;
}
- (void)setEnabled:(BOOL)newEnabled {
enabled = newEnabled;
- if (!enabled
&& window.firstResponder == self
)
- [
window makeFirstResponder:nil
];
+ if (!enabled)
+ [
self resignIfFirstResponder
];
}
- (BOOL)enabled {
}
- (BOOL)enabled {