corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 859683 - Allow scrolling in full-screen mode if and only if the full-screen element is the document element. r=wesj

Browse Source
This commit is contained in:
Kartikaya Gupta
2014-05-06 13:33:13 -04:00
parent a74c70b9ec
commit 8701d11f66
9 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,8 +469,11 @@ class JavaPanZoomController
return false;
case TOUCHING:
// Don't allow panning if there is an element in full-screen mode. See bug 775511.
if ((mTarget.isFullScreen() && !mSubscroller.scrolling()) || panDistance(event) < PAN_THRESHOLD) {
// Don't allow panning if there is a non-root element in full-screen mode. See bug 775511 and bug 859683.
if (mTarget.getFullScreenState() == FullScreenState.NON_ROOT_ELEMENT && !mSubscroller.scrolling()) {
return false;
}
if (panDistance(event) < PAN_THRESHOLD) {
return false;
}
cancelTouch();
@@ -1173,7 +1176,7 @@ class JavaPanZoomController
@Override
public boolean onScale(SimpleScaleGestureDetector detector) {
if (mTarget.isFullScreen())
if (mTarget.getFullScreenState() != FullScreenState.NONE)
return false;
if (mState != PanZoomState.PINCHING)