projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix input name width.
[enjoyable.git]
/
Classes
/
NJDeviceController.m
diff --git
a/Classes/NJDeviceController.m
b/Classes/NJDeviceController.m
index
8417927
..
cb7b917
100644
(file)
--- a/
Classes/NJDeviceController.m
+++ b/
Classes/NJDeviceController.m
@@
-26,6
+26,11
@@
if ((self = [super init])) {
_devices = [[NSMutableArray alloc] initWithCapacity:16];
_continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
if ((self = [super init])) {
_devices = [[NSMutableArray alloc] initWithCapacity:16];
_continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
+ [NSNotificationCenter.defaultCenter
+ addObserver:self
+ selector:@selector(setup)
+ name:NSApplicationDidFinishLaunchingNotification
+ object:nil];
}
return self;
}
}
return self;
}
@@
-44,7
+49,10
@@
}
- (void)addRunningOutput:(NJOutput *)output {
}
- (void)addRunningOutput:(NJOutput *)output {
- [_continousOutputs addObject:output];
+ // Axis events will trigger every small movement, don't keep
+ // re-adding them or they trigger multiple times each time.
+ if (![_continousOutputs containsObject:output])
+ [_continousOutputs addObject:output];
if (!_continuousOutputsTick) {
_continuousOutputsTick = [NSTimer scheduledTimerWithTimeInterval:1.0/60.0
target:self
if (!_continuousOutputsTick) {
_continuousOutputsTick = [NSTimer scheduledTimerWithTimeInterval:1.0/60.0
target:self
@@
-235,7
+243,6
@@
objectValueForTableColumn:(NSTableColumn *)tableColumn
_translatingEvents = translatingEvents;
NSInteger state = translatingEvents ? NSOnState : NSOffState;
translatingEventsButton.state = state;
_translatingEvents = translatingEvents;
NSInteger state = translatingEvents ? NSOnState : NSOffState;
translatingEventsButton.state = state;
- translatingEventsMenu.title = translatingEvents ? @"Disable" : @"Enable";
NSString *name = translatingEvents
? NJEventTranslationActivated
: NJEventTranslationDeactivated;
NSString *name = translatingEvents
? NJEventTranslationActivated
: NJEventTranslationDeactivated;
@@
-248,5
+255,4
@@
objectValueForTableColumn:(NSTableColumn *)tableColumn
self.translatingEvents = sender.state == NSOnState;
}
self.translatingEvents = sender.state == NSOnState;
}
-
@end
@end