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
This commit is contained in:
Mark Salsbery 2014-03-21 11:45:20 -07:00
parent d52df4a9bf
commit f6dfe9b079
2 changed files with 704 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1214
src/mousetracker.js
View File

File diff suppressed because it is too large Load Diff

15
src/viewer.js
View File

@ -1755,11 +1755,7 @@ function onCanvasDrag( event ) {
if( !this.panVertical ){ if( !this.panVertical ){
event.delta.y = 0; event.delta.y = 0;
} }
this.viewport.panBy( this.viewport.panBy( this.viewport.deltaPointsFromPixels( event.delta.negate() ), true );
this.viewport.deltaPointsFromPixels(
event.delta.negate()
)
);
if( this.constrainDuringPan ){ if( this.constrainDuringPan ){
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
@ -1856,7 +1852,7 @@ function onCanvasPinch(event) {
// lastCenter: // lastCenter:
// center: // center:
// lastDistance: // lastDistance:
// currentDistance: // distance:
// originalEvent: // originalEvent:
// preventDefaultAction: // preventDefaultAction:
// userData: // userData:
@ -1864,8 +1860,8 @@ function onCanvasPinch(event) {
if (!event.preventDefaultAction && this.viewport) { if (!event.preventDefaultAction && this.viewport) {
var centerPt = this.viewport.pointFromPixel( event.center, true ), var centerPt = this.viewport.pointFromPixel( event.center, true ),
lastCenterPt = this.viewport.pointFromPixel( event.lastCenter, true ); lastCenterPt = this.viewport.pointFromPixel( event.lastCenter, true );
this.viewport.zoomBy( event.currentDistance / event.lastDistance, centerPt, true ); this.viewport.zoomBy( event.distance / event.lastDistance, centerPt, true );
this.viewport.panBy( lastCenterPt.minus( centerPt ), false ); this.viewport.panBy( lastCenterPt.minus( centerPt ), true );
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
/** /**
@ -1879,13 +1875,12 @@ function onCanvasPinch(event) {
* @property {OpenSeadragon.Point} position - The position of the event relative to the tracked element. * @property {OpenSeadragon.Point} position - The position of the event relative to the tracked element.
* @property {Number} delta - The pinch delta for the event. * @property {Number} delta - The pinch delta for the event.
* @property {Boolean} shift - True if the shift key was pressed during this event. * @property {Boolean} shift - True if the shift key was pressed during this event.
* @property {OpenSeadragon.GesturePoint[]} gesturePoints -
* @property {Object} originalEvent - The original DOM event. * @property {Object} originalEvent - The original DOM event.
* @property {?Object} userData - Arbitrary subscriber-defined object. * @property {?Object} userData - Arbitrary subscriber-defined object.
*/ */
this.raiseEvent('canvas-pinch', { this.raiseEvent('canvas-pinch', {
tracker: event.eventSource, tracker: event.eventSource,
position: event.position,
delta: event.delta,
shift: event.shift, shift: event.shift,
originalEvent: event.originalEvent originalEvent: event.originalEvent
}); });