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' into feature-resize-panel

Browse Source
This commit is contained in:
jdescottes 2014-02-09 21:12:32 +01:00
commit 0dc5b2bc31
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/controller/PiskelController.js
View File

@ -98,7 +98,7 @@
l.removeFrameAt(index); l.removeFrameAt(index);
}); });
// Current frame index is impacted if the removed frame was before the current frame // Current frame index is impacted if the removed frame was before the current frame
if (this.currentFrameIndex >= index) { if (this.currentFrameIndex >= index && this.currentFrameIndex > 0) {
this.setCurrentFrameIndex(this.currentFrameIndex - 1); this.setCurrentFrameIndex(this.currentFrameIndex - 1);
} }

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

@ -92,6 +92,10 @@
} }
}; };
ns.BaseSelect.prototype.hideHighlightedPixel = function() {
// there is no highlighted pixel for selection tools, do nothing
};
/** /**
* For each pixel in the selection draw it in white transparent on the tool overlay * For each pixel in the selection draw it in white transparent on the tool overlay
* @protected * @protected