Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 699937 - Prevent getting stuck in overscroll [r=Cwiiis]

Browse Source 
Tapping while the page is in overscroll cancels the snap
back and leaves the page stuck in overscroll. To fix,
ensure we always try a snapback when the user removes their
finger.
This commit is contained in:
Kartikaya Gupta 2011-11-21 15:26:45 -05:00
parent 9f8d627d5a
commit 1bf3150420
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,13 +132,15 @@ public class PanZoomController
*/
private boolean onTouchStart(MotionEvent event) {
// user is taking control of movement, so stop
// any auto-movement we have going
if (mFlingTimer != null) {
mFlingTimer.cancel();
mFlingTimer = null;
}
switch (mState) {
case FLING:
if (mFlingTimer != null) {
mFlingTimer.cancel();
mFlingTimer = null;
}
// fall through
case NOTHING:
mState = PanZoomState.TOUCHING;
mX.firstTouchPos = mX.touchPos = event.getX(0);
@ -197,7 +199,10 @@ public class PanZoomController
return false;
case TOUCHING:
mState = PanZoomState.NOTHING;
// TODO: send click to gecko
// the switch into TOUCHING might have happened while the page was
// snapping back after overscroll. we need to finish the snap if that
// was the case
fling();
return false;
case PANNING:
case PANNING_LOCKED:
@ -228,6 +233,8 @@ public class PanZoomController
private boolean onTouchCancel(MotionEvent event) {
mState = PanZoomState.NOTHING;
// ensure we snap back if we're overscrolled
fling();
return false;
}