Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 12:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 565117 - Don't revert axis locking after scrolling past a certain distance [r=stechz]

Browse Source
This commit is contained in:
Mark Brubeck 2010-05-17 10:33:49 -07:00
parent ec98415256
commit f5d8f75882
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/chrome/content/InputHandler.js
View File

@ -51,6 +51,9 @@ const kDoubleClickThreshold = 200;
// threshold in pixels for sensing a tap as opposed to a pan
const kTapRadius = 25;
// maximum drag distance in pixels while axis locking can still be reverted
const kAxisLockRevertThreshold = 200;
// Same as NS_EVENT_STATE_ACTIVE from nsIEventStateManager.h
const kStateActive = 0x00000001;
@ -811,6 +814,7 @@ DragData.prototype = {
this.sX = null;
this.sY = null;
this.locked = false;
this.stayLocked = false;
this.lockedX = null;
this.lockedY = null;
this._originX = null;
@ -852,11 +856,16 @@ DragData.prototype = {
let absX = Math.abs(this._originX - sX);
let absY = Math.abs(this._originY - sY);
if (absX > kAxisLockRevertThreshold || absY > kAxisLockRevertThreshold)
this.stayLocked = true;
// After the first lock, see if locking decision should be reverted.
if (this.lockedX && absX > 3 * absY)
this.lockedX = null;
else if (this.lockedY && absY > 3 * absX)
this.lockedY = null;
if (!this.stayLocked) {
if (this.lockedX && absX > 3 * absY)
this.lockedX = null;
else if (this.lockedY && absY > 3 * absX)
this.lockedY = null;
}
if (!this.locked) {
// look at difference from origin coord to lock movement, but only
@ -892,6 +901,7 @@ DragData.prototype = {
this.sY = this._originY = screenY;
this.dragging = true;
this.locked = false;
this.stayLocked = false;
},
endDrag: function endDrag() {