diff options
| author | Pushkar Joshi | 2012-03-28 11:49:39 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-28 11:49:39 -0700 |
| commit | 22f0b9c06d8964f473dcb70dc3e2f8acac71bb0a (patch) | |
| tree | 4adc40f81090a4f3f3165c3cbd6b90152dec53e6 /js/lib | |
| parent | 3fd098981077e40841c013a8ac305036d08a215b (diff) | |
| parent | fa5c9dbdc3e8618d494e142e0967fa69049d0c97 (diff) | |
| download | ninja-22f0b9c06d8964f473dcb70dc3e2f8acac71bb0a.tar.gz | |
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js/lib')
| -rwxr-xr-x | js/lib/geom/brush-stroke.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js index d849e3d7..22209815 100755 --- a/js/lib/geom/brush-stroke.js +++ b/js/lib/geom/brush-stroke.js | |||
| @@ -545,8 +545,8 @@ var BrushStroke = function GLBrushStroke() { | |||
| 545 | var newLeft = Math.round(this._stageWorldCenter[0] - 0.5 * bboxWidth); | 545 | var newLeft = Math.round(this._stageWorldCenter[0] - 0.5 * bboxWidth); |
| 546 | var newTop = Math.round(this._stageWorldCenter[1] - 0.5 * bboxHeight); | 546 | var newTop = Math.round(this._stageWorldCenter[1] - 0.5 * bboxHeight); |
| 547 | //assign the new position, width, and height as the canvas dimensions through the canvas controller | 547 | //assign the new position, width, and height as the canvas dimensions through the canvas controller |
| 548 | CanvasController.setProperty(this._canvas, "left", newLeft+"px"); | 548 | //CanvasController.setProperty(this._canvas, "left", newLeft+"px"); |
| 549 | CanvasController.setProperty(this._canvas, "top", newTop+"px"); | 549 | //CanvasController.setProperty(this._canvas, "top", newTop+"px"); |
| 550 | 550 | ||
| 551 | CanvasController.setProperty(this._canvas, "width", bboxWidth+"px"); | 551 | CanvasController.setProperty(this._canvas, "width", bboxWidth+"px"); |
| 552 | CanvasController.setProperty(this._canvas, "height", bboxHeight+"px"); | 552 | CanvasController.setProperty(this._canvas, "height", bboxHeight+"px"); |