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

Issue #311 : Add lasso tool. Implementation and cleanup

Browse Source
This commit is contained in:
jdescottes
2015-09-22 00:33:04 +02:00
parent 7554b3355c
commit 28912fc58f
11 changed files with 207 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/js/controller/ToolController.js
View File

@@ -16,9 +16,9 @@
toDescriptor('rectangle', 'R', new pskl.tools.drawing.Rectangle()),
toDescriptor('circle', 'C', new pskl.tools.drawing.Circle()),
toDescriptor('move', 'M', new pskl.tools.drawing.Move()),
toDescriptor('rectangleSelect', 'S', new pskl.tools.drawing.RectangleSelect()),
toDescriptor('lassoSelect', 'S', new pskl.tools.drawing.LassoSelect()),
toDescriptor('shapeSelect', 'Z', new pskl.tools.drawing.ShapeSelect()),
toDescriptor('rectangleSelect', 'S', new pskl.tools.drawing.selection.RectangleSelect()),
toDescriptor('lassoSelect', 'H', new pskl.tools.drawing.selection.LassoSelect()),
toDescriptor('shapeSelect', 'Z', new pskl.tools.drawing.selection.ShapeSelect()),
toDescriptor('lighten', 'U', new pskl.tools.drawing.Lighten()),
toDescriptor('dithering', 'T', new pskl.tools.drawing.DitheringTool()),
toDescriptor('colorPicker', 'O', new pskl.tools.drawing.ColorPicker())
@@ -97,22 +97,12 @@
};
ns.ToolController.prototype.onKeyboardShortcut_ = function(charkey) {
var tools = [];
for (var i = 0 ; i < this.tools.length ; i++) {
var tool = this.tools[i];
if (tool.shortcut.toLowerCase() === charkey.toLowerCase()) {
tools.push(tool);
this.selectTool_(tool);
}
}
if (tools.length === 0) {
return;
}
var currentToolIndex = tools.indexOf(this.currentSelectedTool);
this.selectTool_(tools[(currentToolIndex+1) % tools.length]);
};
ns.ToolController.prototype.getToolById_ = function (toolId) {