mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-01 07:31:41 +03:00
Code Issues Projects Releases Wiki Activity

Multi-Touch MouseTracker Update

Browse Source 
Pinch gesture fixups
This commit is contained in:
Mark Salsbery 2014-03-15 17:12:13 -07:00
parent 7aa0df1b66
commit d52df4a9bf
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mousetracker.js
View File

@ -2215,7 +2215,6 @@
//} //}
delta = delegate.pinchGesturePoints[0].currentPos.distanceTo( delegate.pinchGesturePoints[1].currentPos ); delta = delegate.pinchGesturePoints[0].currentPos.distanceTo( delegate.pinchGesturePoints[1].currentPos );
if ( delta != delegate.currentPinchDist ) { if ( delta != delegate.currentPinchDist ) {
//window.alert(delegate.pinchGesturePoints[0].currentPos.x + ',' + delegate.pinchGesturePoints[0].currentPos.y + '\n' + delegate.pinchGesturePoints[1].currentPos.x + ',' + delegate.pinchGesturePoints[1].currentPos.y);
delegate.lastPinchDist = delegate.currentPinchDist; delegate.lastPinchDist = delegate.currentPinchDist;
delegate.currentPinchDist = delta; delegate.currentPinchDist = delta;
delegate.lastPinchCenter = delegate.currentPinchCenter; delegate.lastPinchCenter = delegate.currentPinchCenter;
@ -2224,8 +2223,8 @@
{ {
eventSource: tracker, eventSource: tracker,
gesturePoints: delegate.pinchGesturePoints, gesturePoints: delegate.pinchGesturePoints,
lastCenter: getPointRelative( delegate.lastPinchCenter ), lastCenter: getPointRelative( delegate.lastPinchCenter, tracker.element ),
center: getPointRelative( delegate.currentPinchCenter ), center: getPointRelative( delegate.currentPinchCenter, tracker.element ),
lastDistance: delegate.lastPinchDist, lastDistance: delegate.lastPinchDist,
currentDistance: delegate.currentPinchDist, currentDistance: delegate.currentPinchDist,
originalEvent: event, originalEvent: event,

9
src/viewer.js
View File

@ -1862,11 +1862,10 @@ function onCanvasPinch(event) {
// userData: // userData:
//} //}
if (!event.preventDefaultAction && this.viewport) { if (!event.preventDefaultAction && this.viewport) {
//window.alert(event.lastCenter.x + ',' + event.lastCenter.y + '\n' + event.center.x + ',' + event.center.y); var centerPt = this.viewport.pointFromPixel( event.center, true ),
//TODO This is temporary for testing. Zoom should track pinch gesture one-to-one! lastCenterPt = this.viewport.pointFromPixel( event.lastCenter, true );
this.viewport.zoomBy( event.currentDistance / event.lastDistance, this.viewport.zoomBy( event.currentDistance / event.lastDistance, centerPt, true );
this.viewport.pointFromPixel( event.center, true ) ); this.viewport.panBy( lastCenterPt.minus( centerPt ), false );
this.viewport.panBy( this.viewport.pointFromPixel( event.lastCenter, true ).minus( this.viewport.pointFromPixel( event.center, true ) ), false );
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
/** /**