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 color picker regression with intToColor missing

Browse Source
This commit is contained in:
juliandescottes
2016-10-09 23:49:31 +02:00
parent eb69c91d43
commit 91f637d2fd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/tools/drawing/BaseTool.js
View File

@@ -48,7 +48,7 @@
overlay.clear(); overlay.clear();
} }
var frameColor = frame.getPixel(col, row); var frameColor = pskl.utils.intToColor(frame.getPixel(col, row));
var highlightColor = this.getHighlightColor_(frameColor); var highlightColor = this.getHighlightColor_(frameColor);
var size = this.supportsDynamicPenSize() ? pskl.app.penSizeService.getPenSize() : 1; var size = this.supportsDynamicPenSize() ? pskl.app.penSizeService.getPenSize() : 1;
pskl.PixelUtils.resizePixel(col, row, size).forEach(function (point) { pskl.PixelUtils.resizePixel(col, row, size).forEach(function (point) {

2
src/js/tools/drawing/ColorPicker.js
View File

@@ -19,7 +19,7 @@
*/ */
ns.ColorPicker.prototype.applyToolAt = function(col, row, frame, overlay, event) { ns.ColorPicker.prototype.applyToolAt = function(col, row, frame, overlay, event) {
if (frame.containsPixel(col, row)) { if (frame.containsPixel(col, row)) {
var sampledColor = frame.getPixel(col, row); var sampledColor = pskl.utils.intToColor(frame.getPixel(col, row));
if (pskl.app.mouseStateService.isLeftButtonPressed()) { if (pskl.app.mouseStateService.isLeftButtonPressed()) {
$.publish(Events.SELECT_PRIMARY_COLOR, [sampledColor]); $.publish(Events.SELECT_PRIMARY_COLOR, [sampledColor]);
} else if (pskl.app.mouseStateService.isRightButtonPressed()) { } else if (pskl.app.mouseStateService.isRightButtonPressed()) {