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

Merge branch 'feature-save-panel' of https://github.com/juliandescottes/piskel into feature-save-panel

Browse Source
This commit is contained in:
jdescottes
2014-02-09 21:10:09 +01:00
parent e8d96bf73f fc19695a4a
commit a31e3570f3
5 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/controller/PreviewFilmController.js
View File

@@ -180,7 +180,7 @@
}
var tileCount = document.createElement("div");
tileCount.className = "tile-overlay tile-count";
tileCount.innerHTML = tileNumber;
tileCount.innerHTML = tileNumber + 1;
previewTileRoot.appendChild(tileCount);

8
js/drawingtools/BaseTool.js
View File

@@ -32,9 +32,11 @@
};
ns.BaseTool.prototype.hideHighlightedPixel = function(overlay) {
overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR);
this.highlightedPixelRow = null;
this.highlightedPixelCol = null;
if (this.highlightedPixelRow !== null && this.highlightedPixelCol !== null) {
overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR);
this.highlightedPixelRow = null;
this.highlightedPixelCol = null;
}
};

3
js/drawingtools/selectiontools/BaseSelect.js
View File

@@ -70,6 +70,9 @@
}
};
ns.BaseSelect.prototype.hideHighlightedPixel = function () {
// not implemented for selection tools
};
/**
* If we mouseover the selection draw inside the overlay frame, show the 'move' cursor