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 : Hide grid when zoom no longer allows proper display

Browse Source
This commit is contained in:
jdescottes 2015-09-19 00:07:14 +02:00 committed by grosbouddha
parent 3f992cbb4a
commit 9f31b2c7e4
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,11 +140,23 @@
}; };
ns.FrameRenderer.prototype.getGridWidth = function () { ns.FrameRenderer.prototype.getGridWidth = function () {
if (this.supportGridRendering) { if (!this.supportGridRendering) {
return this.gridWidth_;
} else {
return 0; return 0;
} }
return this.gridWidth_;
};
/**
* Compute a grid width value best suited to the current display context,
* particularly for the current zoom level
*/
ns.FrameRenderer.prototype.computeGridWidthForDisplay_ = function () {
var gridWidth = this.getGridWidth();
while (this.zoom < 6 * gridWidth) {
gridWidth--;
}
return gridWidth;
}; };
ns.FrameRenderer.prototype.updateMargins_ = function (frame) { ns.FrameRenderer.prototype.updateMargins_ = function (frame) {
@ -249,7 +261,7 @@
var isIE10 = pskl.utils.UserAgent.isIE && pskl.utils.UserAgent.version === 10; var isIE10 = pskl.utils.UserAgent.isIE && pskl.utils.UserAgent.version === 10;
var gridWidth = this.getGridWidth(); var gridWidth = this.computeGridWidthForDisplay_();
var isGridEnabled = gridWidth > 0; var isGridEnabled = gridWidth > 0;
if (isGridEnabled || isIE10) { if (isGridEnabled || isIE10) {
var scaled = pskl.utils.ImageResizer.resizeNearestNeighbour(this.canvas, this.zoom, gridWidth); var scaled = pskl.utils.ImageResizer.resizeNearestNeighbour(this.canvas, this.zoom, gridWidth);