Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wes Johnston 2013-09-23 11:47:05 -07:00
parent 4dc4c594f2
commit 07776a1d0b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/base/gfx/JavaPanZoomController.java
View File

@ -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);
}