From 841885939d0d8c002ab3440749adec7712c48983 Mon Sep 17 00:00:00 2001 From: Vince Date: Fri, 14 Sep 2012 20:12:21 +0200 Subject: [PATCH] Basic lasso tool --- css/tools.css | 12 +- index.html | 8 +- js/KeyManager.js | 6 +- js/ToolSelector.js | 3 +- js/drawingtools/PaintBucket.js | 103 +------------- js/drawingtools/selectiontools/BaseSelect.js | 53 +++++++ .../RectangleSelect.js} | 51 ++----- js/drawingtools/selectiontools/ShapeSelect.js | 75 ++++++++++ js/selection/SelectionManager.js | 4 +- js/selection/ShapeSelection.js | 9 ++ js/utils/pixelUtils.js | 132 ++++++++++++++++++ 11 files changed, 302 insertions(+), 154 deletions(-) create mode 100644 js/drawingtools/selectiontools/BaseSelect.js rename js/drawingtools/{RectangularSelect.js => selectiontools/RectangleSelect.js} (57%) create mode 100644 js/drawingtools/selectiontools/ShapeSelect.js create mode 100644 js/selection/ShapeSelection.js diff --git a/css/tools.css b/css/tools.css index 30ed57bf..4b3f013f 100644 --- a/css/tools.css +++ b/css/tools.css @@ -49,10 +49,14 @@ background-image: url(../img/tools/icons/hand.png); } -.tool-icon.tool-select { +.tool-icon.tool-rectangle-select { background-image: url(../img/tools/icons/select.png); } +.tool-icon.tool-shape-select { + background-image: url(../img/tools/icons/wand.png); +} + /*.tool-icon.tool-palette { background-image: url(../img/tools/icons/color-palette.png); }*/ @@ -81,10 +85,14 @@ cursor: url(../img/tools/cursors/hand.png) 14 12, pointer; } -.tool-select .drawing-canvas-container:hover { +.tool-rectangle-select .drawing-canvas-container:hover { cursor: url(../img/tools/cursors/select.png) 14 12, pointer; } +.tool-shape-select .drawing-canvas-container:hover { + cursor: url(../img/tools/cursors/wand.png) 14 12, pointer; +} + .tool-grid, .tool-grid label, .tool-grid input { diff --git a/index.html b/index.html index edeafe43..55bb985b 100644 --- a/index.html +++ b/index.html @@ -32,7 +32,8 @@
  • -
  • +
  • +