Merge pull request #2118 from NativeScript/TheOriginalJosh-use-getRawX-Y-instead-of-getX-Y-to-allow-smoother-panning-coordinates

The original josh use get raw x y instead of get x y to allow smoother panning coordinates
This commit is contained in:
Alexander Vakrilov
2016-05-18 16:42:44 +03:00

View File

@ -468,7 +468,7 @@ class CustomPanGestureDetector {
} }
private trackStart(currentEvent: android.view.MotionEvent) { private trackStart(currentEvent: android.view.MotionEvent) {
let inital = this.getMotionEventCenter(this.lastEventCache ? this.lastEventCache : currentEvent); let inital = this.getEventCoordinates(this.lastEventCache ? this.lastEventCache : currentEvent);
this.initialX = inital.x; this.initialX = inital.x;
this.initialY = inital.y; this.initialY = inital.y;
this.isTracking = true; this.isTracking = true;
@ -478,7 +478,7 @@ class CustomPanGestureDetector {
} }
private trackChange(currentEvent: android.view.MotionEvent) { private trackChange(currentEvent: android.view.MotionEvent) {
let current = this.getMotionEventCenter(currentEvent); let current = this.getEventCoordinates(currentEvent);
this.deltaX = current.x - this.initialX; this.deltaX = current.x - this.initialX;
this.deltaY = current.y - this.initialY; this.deltaY = current.y - this.initialY;
@ -486,19 +486,29 @@ class CustomPanGestureDetector {
_executeCallback(this.observer, args); _executeCallback(this.observer, args);
} }
private getMotionEventCenter(event: android.view.MotionEvent): { x: number, y: number } { private getEventCoordinates(event: android.view.MotionEvent): { x: number, y: number } {
let count = event.getPointerCount(); const count = event.getPointerCount();
if (count === 1) {
return {
x: event.getRawX() / this.density,
y: event.getRawY() / this.density
};
}
else {
const offX = event.getRawX() - event.getX();
const offY = event.getRawY() - event.getY();
let res = { x: 0, y: 0 }; let res = { x: 0, y: 0 };
for (var i = 0; i < count; i++) {
res.x += event.getX(i); for (let i = 0; i < count; i++) {
res.y += event.getY(i); res.x += event.getX(i) + offX;
res.y += event.getY(i) + offY;
} }
res.x /= (count * this.density); res.x /= (count * this.density);
res.y /= (count * this.density); res.y /= (count * this.density);
return res; return res;
} }
}
} }
class CustomRotateGestureDetector { class CustomRotateGestureDetector {