Fixed window resize for navigator with multi-image

This commit is contained in:
Ian Gilman 2014-12-03 11:13:06 -08:00
parent 7078826be1
commit 211127b87b
2 changed files with 3 additions and 16 deletions

View File

@ -272,23 +272,10 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
(this.container.clientWidth === 0 ? 1 : this.container.clientWidth),
(this.container.clientHeight === 0 ? 1 : this.container.clientHeight)
);
if ( !containerSize.equals( this.oldContainerSize ) ) {
var oldBounds = this.viewport.getBounds();
var oldCenter = this.viewport.getCenter();
this.viewport.resize( containerSize, true );
var worldBounds = this.world.getHomeBounds();
var aspectRatio = worldBounds.width / worldBounds.height;
var imageHeight = 1 / aspectRatio;
var newWidth = oldBounds.width <= 1 ? oldBounds.width : 1;
var newHeight = oldBounds.height <= imageHeight ?
oldBounds.height : imageHeight;
var newBounds = new $.Rect(
oldCenter.x - ( newWidth / 2.0 ),
oldCenter.y - ( newHeight / 2.0 ),
newWidth,
newHeight
);
this.viewport.fitBounds( newBounds, true );
this.viewport.goHome(true);
this.oldContainerSize = containerSize;
this.drawer.update();
}

View File

@ -9,7 +9,7 @@
var testInitialOpen = true;
var testOverlays = false;
var testMargins = false;
var testNavigator = false;
var testNavigator = true;
var margins;
var config = {