Bug 918086 - Disable overscroll when pinch zooming. r=kats

2013-09-23 11:47:05 -07:00
parent efc7ef7ecb
commit 4b30dcd514
1 changed files with 5 additions and 0 deletions
--- a/mobile/android/base/gfx/JavaPanZoomController.java
+++ b/mobile/android/base/gfx/JavaPanZoomController.java
@@ -1177,6 +1177,11 @@ class JavaPanZoomController
                     mLastZoomFocus.y - detector.getFocusY());
            mLastZoomFocus.set(detector.getFocusX(), detector.getFocusY());
            ImmutableViewportMetrics target = getMetrics().scaleTo(zoomFactor, mLastZoomFocus);
+
+            // If overscroll is diabled, prevent zooming outside the normal document pans.
+            if (mX.getOverScrollMode() == View.OVER_SCROLL_NEVER || mY.getOverScrollMode() == View.OVER_SCROLL_NEVER) {
+                target = getValidViewportMetrics(target);
+            }
            mTarget.setViewportMetrics(target);
        }