mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 13:16:10 +03:00
Code Issues Projects Releases Wiki Activity

Fixed constraints for when homeBounds.x or y is negative

Browse Source
This commit is contained in:
Ian Gilman 2014-08-26 15:12:49 -07:00
parent 5a1a41428b
commit 6f0f23e728
2 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openseadragon.js
View File

@ -254,7 +254,7 @@
* @property {Number} [visibilityRatio=0.5] * @property {Number} [visibilityRatio=0.5]
* The percentage ( as a number from 0 to 1 ) of the source image which * The percentage ( as a number from 0 to 1 ) of the source image which
* must be kept within the viewport. If the image is dragged beyond that * must be kept within the viewport. If the image is dragged beyond that
* limit, it will 'bounce' back until the minimum visibility ration is * limit, it will 'bounce' back until the minimum visibility ratio is
* achieved. Setting this to 0 and wrapHorizontal ( or wrapVertical ) to * achieved. Setting this to 0 and wrapHorizontal ( or wrapVertical ) to
* true will provide the effect of an infinitely scrolling viewport. * true will provide the effect of an infinitely scrolling viewport.
* *

63
src/viewport.js
View File

@ -361,13 +361,7 @@ $.Viewport.prototype = /** @lends OpenSeadragon.Viewport.prototype */{
* @return {OpenSeadragon.Rect} constrained bounds. * @return {OpenSeadragon.Rect} constrained bounds.
*/ */
_applyBoundaryConstraints: function( bounds, immediately ) { _applyBoundaryConstraints: function( bounds, immediately ) {
var horizontalThreshold, var dx = 0,
verticalThreshold,
left,
right,
top,
bottom,
dx = 0,
dy = 0, dy = 0,
newBounds = new $.Rect( newBounds = new $.Rect(
bounds.x, bounds.x,
@ -376,49 +370,52 @@ $.Viewport.prototype = /** @lends OpenSeadragon.Viewport.prototype */{
bounds.height bounds.height
); );
horizontalThreshold = this.visibilityRatio * newBounds.width; var horizontalThreshold = this.visibilityRatio * newBounds.width;
verticalThreshold = this.visibilityRatio * newBounds.height; var verticalThreshold = this.visibilityRatio * newBounds.height;
left = newBounds.x + newBounds.width;
right = this.homeBounds.width - newBounds.x;
top = newBounds.y + newBounds.height;
bottom = this.homeBounds.height - newBounds.y;
if ( this.wrapHorizontal ) { if ( this.wrapHorizontal ) {
//do nothing //do nothing
} else { } else {
if ( left < horizontalThreshold ) { var thresholdLeft = newBounds.x + (newBounds.width - horizontalThreshold);
dx = horizontalThreshold - left; if (this.homeBounds.x > thresholdLeft) {
dx = this.homeBounds.x - thresholdLeft;
}
var homeRight = this.homeBounds.x + this.homeBounds.width;
var thresholdRight = newBounds.x + horizontalThreshold;
if (homeRight < thresholdRight) {
var newDx = homeRight - thresholdRight;
if (dx) {
dx = (dx + newDx) / 2;
} else {
dx = newDx;
} }
if ( right < horizontalThreshold ) {
dx = dx ?
( dx + right - horizontalThreshold ) / 2 :
( right - horizontalThreshold );
} }
} }
if ( this.wrapVertical ) { if ( this.wrapVertical ) {
//do nothing //do nothing
} else { } else {
if ( top < verticalThreshold ) { var thresholdTop = newBounds.y + (newBounds.height - verticalThreshold);
dy = ( verticalThreshold - top ); if (this.homeBounds.y > thresholdTop) {
dy = this.homeBounds.y - thresholdTop;
}
var homeBottom = this.homeBounds.y + this.homeBounds.height;
var thresholdBottom = newBounds.y + verticalThreshold;
if (homeBottom < thresholdBottom) {
var newDy = homeBottom - thresholdBottom;
if (dy) {
dy = (dy + newDy) / 2;
} else {
dy = newDy;
} }
if ( bottom < verticalThreshold ) {
dy = dy ?
( dy + bottom - verticalThreshold ) / 2 :
( bottom - verticalThreshold );
} }
} }
if ( dx || dy || immediately ) { if ( dx || dy ) {
newBounds.x += dx; newBounds.x += dx;
newBounds.y += dy; newBounds.y += dy;
if( newBounds.width > this.homeBounds.width ){
newBounds.x = this.homeBounds.width / 2 - newBounds.width/2;
}
if( newBounds.height > this.homeBounds.height){
newBounds.y = this.homeBounds.height / 2 - newBounds.height/2;
}
} }
if( this.viewer ){ if( this.viewer ){