X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputController.m;h=07c077b4048294c783a48bde8086dc938e639cbd;hp=cbb48f7e1cab1a145ef98825de82ecd5ec470cbc;hb=58ce8f7f50f382f18e7b416eca737803af284868;hpb=9d7f100f57dded88fa998a86715a919ca471c3db

diff --git a/Classes/NJOutputController.m b/Classes/NJOutputController.m
index cbb48f7..07c077b 100644
--- a/Classes/NJOutputController.m
+++ b/Classes/NJOutputController.m
@@ -29,6 +29,11 @@
             selector:@selector(mappingListDidChange:)
             name:NJEventMappingListChanged
             object:nil];
+        [NSNotificationCenter.defaultCenter
+             addObserver:self
+             selector:@selector(mappingDidChange:)
+             name:NJEventMappingChanged
+             object:nil];
     }
     return self;
 }
@@ -140,11 +145,12 @@
     [radioButtons selectCellAtRow:5 column:0];
     [sender.window makeFirstResponder:sender];
     if (sender.state == NSOnState) {
-        scrollSpeedSlider.floatValue = (scrollSpeedSlider.maxValue - scrollSpeedSlider.minValue) / 2;
-        [scrollSpeedSlider setEnabled:YES];
+        scrollSpeedSlider.floatValue =
+            scrollSpeedSlider.minValue + (scrollSpeedSlider.maxValue - scrollSpeedSlider.minValue) / 2;
+        scrollSpeedSlider.enabled = YES;
     } else {
         scrollSpeedSlider.floatValue = scrollSpeedSlider.minValue;
-        [scrollSpeedSlider setEnabled:NO];
+        scrollSpeedSlider.enabled = NO;
     }
     [self commit];
 }
@@ -160,7 +166,7 @@
         case 1:
             if (keyInput.hasKeyCode) {
                 NJOutputKeyPress *k = [[NJOutputKeyPress alloc] init];
-                k.vk = keyInput.keyCode;
+                k.keyCode = keyInput.keyCode;
                 return k;
             } else {
                 return nil;
@@ -201,19 +207,19 @@
 }
 
 - (BOOL)enabled {
-    return [radioButtons isEnabled];
+    return radioButtons.isEnabled;
 }
 
 - (void)setEnabled:(BOOL)enabled {
-    [radioButtons setEnabled:enabled];
-    [keyInput setEnabled:enabled];
-    [mappingPopup setEnabled:enabled];
-    [mouseDirSelect setEnabled:enabled];
-    [mouseSpeedSlider setEnabled:enabled];
-    [mouseBtnSelect setEnabled:enabled];
-    [scrollDirSelect setEnabled:enabled];
-    [smoothCheck setEnabled:enabled];
-    [scrollSpeedSlider setEnabled:enabled && smoothCheck.isEnabled];
+    radioButtons.enabled = enabled;
+    keyInput.enabled = enabled;
+    mappingPopup.enabled = enabled;
+    mouseDirSelect.enabled = enabled;
+    mouseSpeedSlider.enabled = enabled;
+    mouseBtnSelect.enabled = enabled;
+    scrollDirSelect.enabled = enabled;
+    smoothCheck.enabled = enabled;
+    scrollSpeedSlider.enabled = enabled && smoothCheck.state;
 }
 
 - (void)loadOutput:(NJOutput *)output forInput:(NJInput *)input {
@@ -223,15 +229,15 @@
     } else {
         self.enabled = YES;
         NSString *inpFullName = input.name;
-        for (id <NJInputPathElement> cur = input.base; cur; cur = cur.base) {
-            inpFullName = [[NSString alloc] initWithFormat:@"%@ > %@", cur.name, inpFullName];
+        for (NJInputPathElement *cur = input.parent; cur; cur = cur.parent) {
+            inpFullName = [[NSString alloc] initWithFormat:@"%@ ▸ %@", cur.name, inpFullName];
         }
         title.stringValue = inpFullName;
     }
 
     if ([output isKindOfClass:NJOutputKeyPress.class]) {
         [radioButtons selectCellAtRow:1 column:0];
-        keyInput.keyCode = [(NJOutputKeyPress*)output vk];
+        keyInput.keyCode = [(NJOutputKeyPress*)output keyCode];
     } else if ([output isKindOfClass:NJOutputMapping.class]) {
         [radioButtons selectCellAtRow:2 column:0];
         NSMenuItem *item = [mappingPopup itemWithRepresentedObject:[(NJOutputMapping *)output mapping]];
@@ -256,7 +262,7 @@
         [scrollDirSelect selectSegmentWithTag:direction];
         scrollSpeedSlider.floatValue = speed;
         smoothCheck.state = smooth ? NSOnState : NSOffState;
-        [scrollSpeedSlider setEnabled:smooth];
+        scrollSpeedSlider.enabled = smooth;
     } else {
         [radioButtons selectCellAtRow:self.enabled ? 0 : -1 column:0];
     }
@@ -275,7 +281,7 @@
 }
 
 - (void)mappingListDidChange:(NSNotification *)note {
-    NSArray *mappings = note.object;
+    NSArray *mappings = note.userInfo[NJMappingListKey];
     NJMapping *current = mappingPopup.selectedItem.representedObject;
     [mappingPopup.menu removeAllItems];
     for (NJMapping *mapping in mappings) {
@@ -289,4 +295,8 @@
     [mappingPopup selectItemWithRepresentedObject:current];
 }
 
+- (void)mappingDidChange:(NSNotification *)note {
+    [self loadCurrent];
+}
+
 @end