Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-30 10:12:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 734496 - Don't apply resistance to pinch zoom unless an axis is in overscroll on both sides. r=Cwiiis

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-08-11 13:32:04 -04:00
parent 0ec3bd25cf
commit b230038f25
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/base/ui/Axis.java
View File

@ -216,9 +216,9 @@ abstract class Axis {
* Returns the resistance, as a multiplier, that should be taken into account when
* tracking or pinching.
*/
float getEdgeResistance() {
float getEdgeResistance(boolean forPinching) {
float excess = getExcess();
if (excess > 0.0f) {
if (excess > 0.0f && (getOverscroll() == Overscroll.BOTH || !forPinching)) {
// excess can be greater than viewport length, but the resistance
// must never drop below 0.0
return Math.max(0.0f, SNAP_LIMIT - excess / getViewportLength());
@ -299,7 +299,7 @@ abstract class Axis {
}
if (mFlingState == FlingStates.PANNING)
mDisplacement += (mLastTouchPos - mTouchPos) * getEdgeResistance();
mDisplacement += (mLastTouchPos - mTouchPos) * getEdgeResistance(false);
else
mDisplacement += mVelocity;
}

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

@ -921,7 +921,7 @@ public class PanZoomController
* Apply edge resistance if we're zoomed out smaller than the page size by scaling the zoom
* factor toward 1.0.
*/
float resistance = Math.min(mX.getEdgeResistance(), mY.getEdgeResistance());
float resistance = Math.min(mX.getEdgeResistance(true), mY.getEdgeResistance(true));
if (spanRatio > 1.0f)
spanRatio = 1.0f + (spanRatio - 1.0f) * resistance;
else