diff options
author | Valerio Virgillito | 2012-03-13 11:15:56 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-13 11:15:56 -0700 |
commit | 91335d6572a611ecde7a71dbbfdb82bdb40f7e2b (patch) | |
tree | b1218ee5607151ac62cbfd92d60062de5557d618 /js/tools/PenTool.js | |
parent | f6b958360d82854bdaf51848e7fd715d1f633179 (diff) | |
parent | 7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff) | |
download | ninja-91335d6572a611ecde7a71dbbfdb82bdb40f7e2b.tar.gz |
Merge pull request #108 from pushkarjoshi/brushtool
Brushtool
Diffstat (limited to 'js/tools/PenTool.js')
-rwxr-xr-x | js/tools/PenTool.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 71a91870..6897c003 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -278,6 +278,9 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
278 | this.application.ninja.stage.clearDrawingCanvas(); | 278 | this.application.ninja.stage.clearDrawingCanvas(); |
279 | this._hoveredAnchorIndex = -1; | 279 | this._hoveredAnchorIndex = -1; |
280 | 280 | ||
281 | //set the cursor to be the default cursor | ||
282 | this.application.ninja.stage.drawingCanvas.style.cursor = "auto"; | ||
283 | |||
281 | if (this._isDrawing) { | 284 | if (this._isDrawing) { |
282 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); | 285 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); |
283 | //go through the drawing toolbase to get the position of the mouse | 286 | //go through the drawing toolbase to get the position of the mouse |
@@ -348,6 +351,14 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
348 | var selAnchor = this._selectedSubpath.pickAnchor(currMousePos[0], currMousePos[1], currMousePos[2], this._PICK_POINT_RADIUS); | 351 | var selAnchor = this._selectedSubpath.pickAnchor(currMousePos[0], currMousePos[1], currMousePos[2], this._PICK_POINT_RADIUS); |
349 | if (selAnchor >=0) { | 352 | if (selAnchor >=0) { |
350 | this._hoveredAnchorIndex = selAnchor; | 353 | this._hoveredAnchorIndex = selAnchor; |
354 | } else { | ||
355 | //detect if the current mouse position will hit the path | ||
356 | var pathHitTestData = this._selectedSubpath.pathHitTest(currMousePos[0], currMousePos[1], currMousePos[2], this._PICK_POINT_RADIUS); | ||
357 | if (pathHitTestData[0]!==-1){ | ||
358 | //change the cursor | ||
359 | var cursor = "url('images/cursors/penAdd.png') 10 10,default"; | ||
360 | this.application.ninja.stage.drawingCanvas.style.cursor = cursor; | ||
361 | } | ||
351 | } | 362 | } |
352 | } | 363 | } |
353 | } //else of if (this._isDrawing) { | 364 | } //else of if (this._isDrawing) { |
@@ -356,7 +367,6 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
356 | if (this._selectedSubpath){ | 367 | if (this._selectedSubpath){ |
357 | this.DrawSubpathAnchors(this._selectedSubpath); | 368 | this.DrawSubpathAnchors(this._selectedSubpath); |
358 | } | 369 | } |
359 | |||
360 | }//value: function(event) | 370 | }//value: function(event) |
361 | },//HandleMouseMove | 371 | },//HandleMouseMove |
362 | 372 | ||