Merge remote-tracking branch 'origin/master' into feature/alignment

natario1 · Jan 23, 2019 · e37522d · e37522d
2 parents 08cda64 + 5f41755
commit e37522d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/library/src/main/java/com/otaliastudios/zoom/ZoomEngine.kt b/library/src/main/java/com/otaliastudios/zoom/ZoomEngine.kt
@@ -1064,6 +1064,11 @@ internal constructor(context: Context) : ViewTreeObserver.OnGlobalLayoutListener
          */
         override fun onScroll(e1: MotionEvent, e2: MotionEvent,
                               @AbsolutePan distanceX: Float, @AbsolutePan distanceY: Float): Boolean {
+
+            if (!mHorizontalPanEnabled && !mVerticalPanEnabled) {
+                return false
+            }
+
             var delta = AbsolutePoint(distanceX, distanceY)
             if (setState(SCROLLING)) {
                 // Change sign, since we work with opposite values.