mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Fix #651 - stop drawing the zoomedout background if unnecessary

Browse Source
This commit is contained in:
juliandescottes 2017-05-06 11:55:14 +02:00 committed by Julian Descottes
parent d841ad10f6
commit b8fed60fa6
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/js/rendering/frame/FrameRenderer.js
View File

@ -252,14 +252,24 @@
var displayContext = this.displayCanvas.getContext('2d'); var displayContext = this.displayCanvas.getContext('2d');
displayContext.save(); displayContext.save();
// Draw background var translateX = this.margin.x - this.offset.x * z;
displayContext.fillStyle = Constants.ZOOMED_OUT_BACKGROUND_COLOR; var translateY = this.margin.y - this.offset.y * z;
displayContext.fillRect(0, 0, this.displayCanvas.width - 1, this.displayCanvas.height - 1);
displayContext.translate( var isZoomedOut = translateX > 0 || translateY > 0;
this.margin.x - this.offset.x * z, // Draw the background / zoomed-out color only if needed. Otherwise the clearRect
this.margin.y - this.offset.y * z // happening after that will clear "out of bounds" and seems to be doing nothing
); // on some chromebooks (cf https://github.com/juliandescottes/piskel/issues/651)
if (isZoomedOut) {
// Draw background
displayContext.fillStyle = Constants.ZOOMED_OUT_BACKGROUND_COLOR;
// The -1 on the width and height here is a workaround for a Chrome-only bug
// that was potentially fixed, but is very hardware dependant. Seems to be
// triggered when doing clear rect or fill rect using the full width & height
// of a canvas. (https://bugs.chromium.org/p/chromium/issues/detail?id=469906)
displayContext.fillRect(0, 0, this.displayCanvas.width - 1, this.displayCanvas.height - 1);
}
displayContext.translate(translateX, translateY);
// Scale up to draw the canvas content // Scale up to draw the canvas content
displayContext.scale(z, z); displayContext.scale(z, z);