mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-21 20:56:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:openseadragon/openseadragon

Browse Source
This commit is contained in:
Ian Gilman 2015-09-16 09:35:30 -07:00
commit 451acdd792
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tile.js
View File

@ -265,6 +265,8 @@ $.Tile.prototype = /** @lends OpenSeadragon.Tile.prototype */{
return;
}
context.save();
context.globalAlpha = this.opacity;
//if we are supposed to be rendering fully opaque rectangle,
@ -298,6 +300,8 @@ $.Tile.prototype = /** @lends OpenSeadragon.Tile.prototype */{
size.x * $.pixelDensityRatio,
size.y * $.pixelDensityRatio
);
context.restore();
},
/**

4
src/tiledimage.js
View File

@ -130,6 +130,7 @@ $.TiledImage = function( options ) {
lastResetTime: 0, // Last time for which the tiledImage was reset.
_midDraw: false, // Is the tiledImage currently updating the viewport?
_needsDraw: true, // Does the tiledImage need to update the viewport again?
_hasOpaqueTile: false, // Do we have even one fully opaque tile?
//configurable settings
springStiffness: $.DEFAULT_SETTINGS.springStiffness,
@ -1163,6 +1164,7 @@ function blendTile( tiledImage, tile, x, y, level, levelOpacity, currentTime ){
if ( opacity == 1 ) {
setCoverage( tiledImage.coverage, level, x, y, true );
tiledImage._hasOpaqueTile = true;
} else if ( deltaTime < blendTimeMillis ) {
return true;
}
@ -1311,7 +1313,7 @@ function drawTiles( tiledImage, lastDrawn ) {
usedClip = true;
}
if ( tiledImage.placeholderFillStyle && lastDrawn.length === 0 ) {
if ( tiledImage.placeholderFillStyle && tiledImage._hasOpaqueTile === false ) {
var placeholderRect = tiledImage._drawer.viewportToDrawerRectangle(tiledImage.getBounds(true));
var fillStyle = null;