Remember expanded rows between activations / device insertion.

diff --git a/Classes/NJDevice.m b/Classes/NJDevice.m
index 69775d835d399f3c315bb7e52519726bbdbb9560..e2a0efa6608923fb2f91451f5992181f3b99a39a 100644 (file)
--- a/Classes/NJDevice.m
+++ b/Classes/NJDevice.m
@@ -106,4 +106,28 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id base) {
     return [self findInputByCookie:cookie];
 }
 
+- (BOOL)isEqual:(id)object {
+    return [object isKindOfClass:NJDevice.class]
+        && [[object uid] isEqualToString:self.uid];
+}
+
+- (NSUInteger)hash {
+    return self.uid.hash;
+}
+
+- (id <NJInputPathElement>)elementForUID:(NSString *)uid {
+    if ([uid isEqualToString:self.uid])
+        return self;
+    else if (![uid hasPrefix:self.uid])
+        return nil;
+    else {
+        for (id <NJInputPathElement> elem in self.children) {
+            id <NJInputPathElement> ret = [elem elementForUID:uid];
+            if (ret)
+                return ret;
+        }
+    }
+    return nil;
+}
+
 @end

diff --git a/Classes/NJDeviceController.m b/Classes/NJDeviceController.m
index 2ce3fa93c8f72bb2f6acb4f32b71d9540f5bc76e..a1e58682ca497b547a34453f2ef8bfbe477f4b72 100644 (file)
--- a/Classes/NJDeviceController.m
+++ b/Classes/NJDeviceController.m
@@ -20,12 +20,22 @@
     NSTimer *_continuousOutputsTick;
     NSMutableArray *_continousOutputs;
     NSMutableArray *_devices;
+    NSMutableArray *_expanded;
 }
 
+#define EXPANDED_MEMORY_MAX_SIZE 100
+
 - (id)init {
     if ((self = [super init])) {
         _devices = [[NSMutableArray alloc] initWithCapacity:16];
         _continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
+        
+        NSArray *expanded = [NSUserDefaults.standardUserDefaults objectForKey:@"expanded rows"];
+        if (![expanded isKindOfClass:NSArray.class])
+            expanded = @[];
+        _expanded = [[NSMutableArray alloc] initWithCapacity:MAX(16, _expanded.count)];
+        [_expanded addObjectsFromArray:expanded];
+
         [NSNotificationCenter.defaultCenter
              addObserver:self
              selector:@selector(applicationDidFinishLaunching:)
@@ -68,6 +78,14 @@
     }
 }
 
+- (void)expandRecursiveByUID:(NSString *)uid {
+    for (NJDevice *dev in _devices) {
+        id item = [dev elementForUID:uid];
+        if (item)
+            [self expandRecursive:item];
+    }
+}
+
 - (void)addRunningOutput:(NJOutput *)output {
     // Axis events will trigger every small movement, don't keep
     // re-adding them or they trigger multiple times each time.
@@ -139,6 +157,7 @@ static int findAvailableIndex(NSArray *list, NJDevice *dev) {
     dev.index = findAvailableIndex(_devices, dev);
     [_devices addObject:dev];
     [outlineView reloadData];
+    [self reexpandAll];
     connectDevicePrompt.hidden = !!_devices.count;
 }
 
@@ -274,6 +293,24 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
     return ![self outlineView:outlineView_ isGroupItem:item];
 }
 
+- (void)outlineViewItemDidExpand:(NSNotification *)notification {
+    id <NJInputPathElement> item = notification.userInfo[@"NSObject"];
+    NSString *uid = item.uid;
+    if (![_expanded containsObject:uid])
+        [_expanded addObject:uid];
+    while (_expanded.count > EXPANDED_MEMORY_MAX_SIZE)
+        [_expanded removeObjectAtIndex:0];
+    [NSUserDefaults.standardUserDefaults setObject:_expanded
+                                            forKey:@"expanded rows"];
+}
+
+- (void)outlineViewItemDidCollapse:(NSNotification *)notification {
+    id <NJInputPathElement> item = notification.userInfo[@"NSObject"];
+    [_expanded removeObject:item.uid];
+    [NSUserDefaults.standardUserDefaults setObject:_expanded
+                                            forKey:@"expanded rows"];
+}
+
 - (void)setTranslatingEvents:(BOOL)translatingEvents {
     if (translatingEvents != _translatingEvents) {
         _translatingEvents = translatingEvents;
@@ -292,6 +329,11 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
     }
 }
 
+- (void)reexpandAll {
+    for (NSString *uid in [_expanded copy])
+        [self expandRecursiveByUID:uid];
+}
+
 - (void)closeHidIfDisabled:(NSNotification *)application {
     if (!self.translatingEvents)
         [self closeHid];

diff --git a/Classes/NJInput.m b/Classes/NJInput.m
index a279322583d4a19e9fedb83513b2b30da138e0cc..15b4687059b657343efcd22af02e0ab5d10d193c 100644 (file)
--- a/Classes/NJInput.m
+++ b/Classes/NJInput.m
@@ -29,4 +29,26 @@
     [self doesNotRecognizeSelector:_cmd];
 }
 
+- (BOOL)isEqual:(id)object {
+    return [object isKindOfClass:NJInput.class]
+        && [[object uid] isEqualToString:self.uid];
+}
+
+- (NSUInteger)hash {
+    return self.uid.hash;
+}
+
+- (id <NJInputPathElement>)elementForUID:(NSString *)uid {
+    if ([uid isEqualToString:self.uid])
+        return self;
+    else {
+        for (id <NJInputPathElement> elem in self.children) {
+            id <NJInputPathElement> ret = [elem elementForUID:uid];
+            if (ret)
+                return ret;
+        }
+    }
+    return nil;
+}
+
 @end

diff --git a/Classes/NJInputPathElement.h b/Classes/NJInputPathElement.h
index 87500382f9bdf8836398beac4175f6795dcfbbd4..f3f27c2f9c66b3f63578102dc3b5cd42aeb37c1b 100644 (file)
--- a/Classes/NJInputPathElement.h
+++ b/Classes/NJInputPathElement.h
@@ -2,9 +2,13 @@
 
 @protocol NJInputPathElement <NSObject>
 
+// TODO: It's time this became a real base class rather than a protocol.
+
 - (NSArray *)children;
 - (id <NJInputPathElement>) base;
 - (NSString *)name;
 - (NSString *)uid;
 
+- (id <NJInputPathElement>)elementForUID:(NSString *)uid;
+
 @end

diff --git a/Info.plist b/Info.plist
index c4a9347f2652f469b4eb5d5f35774765b3b8b326..90173478d65018483defa373c9bb38997c3d4901 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>187</string>
+       <string>210</string>
        <key>LSApplicationCategoryType</key>
        <string>public.app-category.utilities</string>
        <key>NSHumanReadableCopyright</key>