X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJDeviceViewController.m;h=8b36a0ee0c692ba086aef91f6b7251829daa0e1b;hp=dfb2dcad72aac10328c24a04ac36e18d77d0e736;hb=6a7c78afa7b8a34901f59a79afe41d18855734bc;hpb=b14d8429658dd6f3f7b4904301031addb502b22c diff --git a/Classes/NJDeviceViewController.m b/Classes/NJDeviceViewController.m index dfb2dca..8b36a0e 100644 --- a/Classes/NJDeviceViewController.m +++ b/Classes/NJDeviceViewController.m @@ -50,18 +50,18 @@ [self.inputsTree beginUpdates]; [self.inputsTree insertItemsAtIndexes:[[NSIndexSet alloc] initWithIndex:idx] inParent:nil - withAnimation:NSTableViewAnimationSlideLeft]; + withAnimation:NSTableViewAnimationEffectFade]; [self reexpandAll]; [self.inputsTree endUpdates]; self.noDevicesNotice.hidden = YES; } -- (void)removedDevice:(NJDevice *)device atIndex:(NSUInteger)idx { +- (void)removedDeviceAtIndex:(NSUInteger)idx { BOOL anyDevices = !![self.delegate numberOfDevicesInDeviceList:self]; [self.inputsTree beginUpdates]; [self.inputsTree removeItemsAtIndexes:[[NSIndexSet alloc] initWithIndex:idx] inParent:nil - withAnimation:NSTableViewAnimationSlideLeft]; + withAnimation:NSTableViewAnimationEffectFade]; [self.inputsTree endUpdates]; self.noDevicesNotice.hidden = anyDevices || !self.hidStoppedNotice.isHidden; } @@ -159,11 +159,9 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn return ![self outlineView:outlineView isGroupItem:item]; } -- (NJInputPathElement *)selectedHandler { +- (NJInput *)selectedHandler { NJInputPathElement *element = self.inputsTree.selectedItem; - return element.children ? nil : element; + return element.children ? nil : (NJInput *)element; } - - @end