X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputController.m;h=cf758e6e399ab2acaa4fabea8f1613eeb2732304;hp=ebedb1b7239cc288905c20a3b3b791b710fd750f;hb=dacfcc6b0bf3bfebc89b5e6e8266da9eb36177cd;hpb=4dabc5c754efa54adb2dc57063c7294b1c2e4654

diff --git a/Classes/NJOutputController.m b/Classes/NJOutputController.m
index ebedb1b..cf758e6 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;
 }
@@ -71,16 +76,13 @@
     if (row != 5) {
         scrollDirSelect.selectedSegment = -1;
         scrollSpeedSlider.floatValue = scrollSpeedSlider.minValue;
+        smoothCheck.state = NSOffState;
         [scrollDirSelect resignIfFirstResponder];
+        [scrollSpeedSlider resignIfFirstResponder];
+        [smoothCheck resignIfFirstResponder];
     } else {
         if (scrollDirSelect.selectedSegment == -1)
             scrollDirSelect.selectedSegment = 0;
-        if (scrollDirSelect.selectedSegment < 2
-            && !scrollSpeedSlider.floatValue)
-            scrollSpeedSlider.floatValue = 15;
-        else if (scrollDirSelect.selectedSegment >= 2
-                 && scrollSpeedSlider.floatValue)
-            scrollSpeedSlider.floatValue = scrollSpeedSlider.minValue;
     }
         
 }
@@ -129,8 +131,6 @@
 
 - (void)sdirChanged:(NSView *)sender {
     [radioButtons selectCellAtRow:5 column:0];
-    if (scrollDirSelect.selectedSegment >= 2)
-        scrollSpeedSlider.floatValue = 0;
     [sender.window makeFirstResponder:sender];
     [self commit];
 }
@@ -138,10 +138,19 @@
 - (void)scrollSpeedChanged:(NSSlider *)sender {
     [radioButtons selectCellAtRow:5 column:0];
     [sender.window makeFirstResponder:sender];
-    if (!sender.floatValue && scrollDirSelect.selectedSegment < 2)
-        scrollDirSelect.selectedSegment += 2;
-    else if (sender.floatValue && scrollDirSelect.selectedSegment >= 2)
-        scrollDirSelect.selectedSegment -= 2;
+    [self commit];
+}
+
+- (IBAction)scrollTypeChanged:(NSButton *)sender {
+    [radioButtons selectCellAtRow:5 column:0];
+    [sender.window makeFirstResponder:sender];
+    if (sender.state == NSOnState) {
+        scrollSpeedSlider.floatValue = (scrollSpeedSlider.maxValue - scrollSpeedSlider.minValue) / 2;
+        [scrollSpeedSlider setEnabled:YES];
+    } else {
+        scrollSpeedSlider.floatValue = scrollSpeedSlider.minValue;
+        [scrollSpeedSlider setEnabled:NO];
+    }
     [self commit];
 }
 
@@ -175,15 +184,14 @@
         }
         case 4: {
             NJOutputMouseButton *mb = [[NJOutputMouseButton alloc] init];
-            mb.humanIndexedButton = mouseBtnSelect.selectedSegment;
+            mb.button = [mouseBtnSelect.cell tagForSegment:mouseBtnSelect.selectedSegment];
             return mb;
         }
         case 5: {
             NJOutputMouseScroll *ms = [[NJOutputMouseScroll alloc] init];
-            ms.direction = (scrollDirSelect.selectedSegment & 1) ? 1 : -1;
-            ms.speed = scrollDirSelect.selectedSegment < 2
-                ? scrollSpeedSlider.floatValue
-                : 0.f;
+            ms.direction = [scrollDirSelect.cell tagForSegment:scrollDirSelect.selectedSegment];
+            ms.speed = scrollSpeedSlider.floatValue;
+            ms.smooth = smoothCheck.state == NSOnState;
             return ms;
         }
         default:
@@ -209,7 +217,8 @@
     [mouseSpeedSlider setEnabled:enabled];
     [mouseBtnSelect setEnabled:enabled];
     [scrollDirSelect setEnabled:enabled];
-    [scrollSpeedSlider setEnabled:enabled];
+    [smoothCheck setEnabled:enabled];
+    [scrollSpeedSlider setEnabled:enabled && smoothCheck.isEnabled];
 }
 
 - (void)loadOutput:(NJOutput *)output forInput:(NJInput *)input {
@@ -242,14 +251,17 @@
     }
     else if ([output isKindOfClass:NJOutputMouseButton.class]) {
         [radioButtons selectCellAtRow:4 column:0];
-        mouseBtnSelect.selectedSegment = [(NJOutputMouseButton *)output humanIndexedButton];
+        [mouseBtnSelect selectSegmentWithTag:[(NJOutputMouseButton *)output button]];
     }
     else if ([output isKindOfClass:NJOutputMouseScroll.class]) {
         [radioButtons selectCellAtRow:5 column:0];
         int direction = [(NJOutputMouseScroll *)output direction];
         float speed = [(NJOutputMouseScroll *)output speed];
-        scrollDirSelect.selectedSegment = (direction > 0) + !speed * 2;
+        BOOL smooth = [(NJOutputMouseScroll *)output smooth];
+        [scrollDirSelect selectSegmentWithTag:direction];
         scrollSpeedSlider.floatValue = speed;
+        smoothCheck.state = smooth ? NSOnState : NSOffState;
+        [scrollSpeedSlider setEnabled:smooth];
     } else {
         [radioButtons selectCellAtRow:self.enabled ? 0 : -1 column:0];
     }
@@ -268,7 +280,7 @@
 }
 
 - (void)mappingListDidChange:(NSNotification *)note {
-    NSArray *mappings = note.object;
+    NSArray *mappings = note.userInfo[@"mappings"];
     NJMapping *current = mappingPopup.selectedItem.representedObject;
     [mappingPopup.menu removeAllItems];
     for (NJMapping *mapping in mappings) {
@@ -282,4 +294,8 @@
     [mappingPopup selectItemWithRepresentedObject:current];
 }
 
+- (void)mappingDidChange:(NSNotification *)note {
+    [self loadCurrent];
+}
+
 @end