wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 715011 - Ensure that panning of subwindows can still happen while the top window is locked on one or both axes. r=Cwiiis

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-01-04 13:25:11 -05:00
parent 37a2ec2e34
commit a14cc99e99
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/android/base/ui/PanZoomController.java
View File

@ -487,7 +487,7 @@ public class PanZoomController
}
mX.setFlingState(Axis.FlingStates.PANNING); mY.setFlingState(Axis.FlingStates.PANNING);
mX.displace(); mY.displace();
mX.displace(mOverridePanning); mY.displace(mOverridePanning);
updatePosition();
}
@ -497,7 +497,7 @@ public class PanZoomController
mX.disableSnap = mY.disableSnap = mOverridePanning;
mX.displace(); mY.displace();
mX.displace(mOverridePanning); mY.displace(mOverridePanning);
updatePosition();
stopAnimationTimer();
@ -670,7 +670,7 @@ public class PanZoomController
/* If we're still flinging in any direction, update the origin. */
if (flingingX || flingingY) {
mX.displace(); mY.displace();
mX.displace(mOverridePanning); mY.displace(mOverridePanning);
updatePosition();
/*
@ -849,8 +849,8 @@ public class PanZoomController
}
// Performs displacement of the viewport position according to the current velocity.
public void displace() {
if (locked || !scrollable())
public void displace(boolean panningOverridden) {
if (!panningOverridden && (locked || !scrollable()))
return;
if (mFlingState == FlingStates.PANNING)