Merge remote-tracking branch 'origin/master'

arauchfuss · Feb 9, 2017 · b28a51f · b28a51f · arauchfuss · Feb 9, 2017
2 parents c99bccc + 9f4e232
commit b28a51f
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/Session/TSSTPageView.m b/Session/TSSTPageView.m
@@ -826,7 +826,27 @@ - (void)scrollWheel:(NSEvent *)theEvent
 		NSPoint scrollPoint = NSMakePoint(NSMinX(visible) - ([theEvent deltaX] * 5), NSMinY(visible) + ([theEvent deltaY] * 5));
 		[self scrollPoint: scrollPoint];
 	}
-
+
+    float deltaX = [theEvent deltaX];
+    if (deltaX != 0.0)
+    {
+        [theEvent trackSwipeEventWithOptions:NSEventSwipeTrackingLockDirection
+                    dampenAmountThresholdMin:-1.0
+                                         max:1.0
+                                usingHandler:^(CGFloat gestureAmount, NSEventPhase phase, BOOL isComplete, BOOL *stop) {
+                                }];
+    }
+
+
+    if (deltaX > 0.0)
+    {
+        [sessionController pageLeft: self];
+    }
+    else if (deltaX < 0.0)
+    {
+        [sessionController pageRight: self];
+    }
+
     [sessionController refreshLoupePanel];
 }