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 701594 - Part 7: Remove the per-axis bounce functionality. r=kats

Browse Source
This commit is contained in:
Patrick Walton 2011-12-07 13:34:15 -08:00
parent 45593fc7d0
commit 16631cef12
1 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -748,23 +748,8 @@ public class PanZoomController
setFlingState(FlingStates.WAITING_TO_SNAP);
}
// Advances a fling animation by one step.
/* Advances a fling animation by one step. */
public void advanceFling() {
switch (mFlingState) {
case FLINGING:
scroll();
return;
case WAITING_TO_SNAP:
// We don't do anything until the controller switches us into the snapping state.
return;
case SNAPPING:
snap();
return;
}
}
// Performs one frame of a scroll operation if applicable.
private void scroll() {
// If we aren't overscrolled, just apply friction.
float excess = getExcess();
if (disableSnap || FloatUtils.fuzzyEquals(excess, 0.0f)) {
@ -789,46 +774,6 @@ public class PanZoomController
}
}
// Starts a snap-into-place operation.
public void startSnap() {
switch (getOverscroll()) {
case MINUS:
mSnapFrame = 0;
mSnapEndPos = getExcess();
break;
case PLUS:
mSnapFrame = 0;
mSnapEndPos = -getExcess();
break;
default:
// no overscroll to deal with, so we're done
setFlingState(FlingStates.STOPPED);
return;
}
displacement = 0;
mSnapPos = 0.0f;
setFlingState(FlingStates.SNAPPING);
}
// Performs one frame of a snap-into-place operation.
private void snap() {
mSnapFrame++;
if (mSnapFrame == EASE_OUT_ANIMATION_FRAMES.length) {
mSnapFrame = -1;
displacement += mSnapEndPos - mSnapPos;
mSnapPos = mSnapEndPos;
setFlingState(FlingStates.STOPPED);
return;
}
float t = EASE_OUT_ANIMATION_FRAMES[mSnapFrame];
float newSnapPos = FloatUtils.interpolate(0.0f, mSnapEndPos, t);
displacement += newSnapPos - mSnapPos;
mSnapPos = newSnapPos;
}
// Performs displacement of the viewport position according to the current velocity.
public void displace() {
if (locked)