mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-25 14:46:10 +03:00
viewport _applyBoundaryConstraints fix
This commit is contained in:
parent
27399beffe
commit
6fa8e6695d
@ -529,16 +529,9 @@ $.Viewport.prototype = {
|
||||
var horizontalThreshold, leftDx, rightDx;
|
||||
if (newBounds.width > this._contentBoundsNoRotate.width) {
|
||||
horizontalThreshold = this.visibilityRatio * this._contentBoundsNoRotate.width;
|
||||
leftDx = this._contentBoundsNoRotate.x - newBounds.x + horizontalThreshold;
|
||||
rightDx = contentRight - boundsRight - horizontalThreshold;
|
||||
|
||||
if (rightDx > 0) {
|
||||
newBounds.x += rightDx;
|
||||
} else if (leftDx < 0) {
|
||||
newBounds.x += leftDx;
|
||||
}
|
||||
} else {
|
||||
horizontalThreshold = this.visibilityRatio * newBounds.width;
|
||||
}
|
||||
leftDx = this._contentBoundsNoRotate.x - boundsRight + horizontalThreshold;
|
||||
rightDx = contentRight - newBounds.x - horizontalThreshold;
|
||||
if (horizontalThreshold > this._contentBoundsNoRotate.width) {
|
||||
@ -548,7 +541,7 @@ $.Viewport.prototype = {
|
||||
} else if (leftDx > 0) {
|
||||
newBounds.x += leftDx;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (this.wrapVertical) {
|
||||
@ -560,16 +553,10 @@ $.Viewport.prototype = {
|
||||
var verticalThreshold, topDy, bottomDy;
|
||||
if (newBounds.height > this._contentBoundsNoRotate.height) {
|
||||
verticalThreshold = this.visibilityRatio * this._contentBoundsNoRotate.height;
|
||||
topDy = this._contentBoundsNoRotate.y - newBounds.y + verticalThreshold;
|
||||
bottomDy = contentBottom - boundsBottom - verticalThreshold;
|
||||
|
||||
if (bottomDy > 0) {
|
||||
newBounds.y += bottomDy;
|
||||
} else if (topDy < 0) {
|
||||
newBounds.y += topDy;
|
||||
}
|
||||
} else {
|
||||
} else{
|
||||
verticalThreshold = this.visibilityRatio * newBounds.height;
|
||||
}
|
||||
|
||||
topDy = this._contentBoundsNoRotate.y - boundsBottom + verticalThreshold;
|
||||
bottomDy = contentBottom - newBounds.y - verticalThreshold;
|
||||
if (verticalThreshold > this._contentBoundsNoRotate.height) {
|
||||
@ -579,7 +566,7 @@ $.Viewport.prototype = {
|
||||
} else if (topDy > 0) {
|
||||
newBounds.y += topDy;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return newBounds;
|
||||
|
Loading…
Reference in New Issue
Block a user