Merge branch 'x-scroll-speed-fix' into quivr-master

Jens Claes · Jens Claes · commit d5c4b58b60b2 · 2015-02-23T20:38:49.000+01:00
diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.java b/library/src/main/java/com/alamkanak/weekview/WeekView.java
@@ -158,7 +158,7 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float d
                     mCurrentScrollDirection = Direction.VERTICAL;
                 }
             }
-            mDistanceX = distanceX;
+            mDistanceX = distanceX * mXScrollingSpeed;
             mDistanceY = distanceY;
             invalidate();
             return true;

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float d`
`158`	`158`	`mCurrentScrollDirection = Direction.VERTICAL;`
`159`	`159`	`}`
`160`	`160`	`}`
`161`		`- mDistanceX = distanceX;`
	`161`	`+ mDistanceX = distanceX * mXScrollingSpeed;`
`162`	`162`	`mDistanceY = distanceY;`
`163`	`163`	`invalidate();`
`164`	`164`	`return true;`