aboutsummaryrefslogtreecommitdiff
path: root/js/stage/tool-handle.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-25 14:45:47 -0700
committerValerio Virgillito2012-04-25 14:45:47 -0700
commitbcc8f8616f5ad4bf310928da6cbc01da12f6e468 (patch)
tree9f3d5f6f4c429a1b4912e835e1cbdf704b59def5 /js/stage/tool-handle.js
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
parentd5510229ebd4549ce435e3947874cc37eef27ffb (diff)
downloadninja-bcc8f8616f5ad4bf310928da6cbc01da12f6e468.tar.gz
Merge pull request #175 from mqg734/BoundsCalculation
Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
Diffstat (limited to 'js/stage/tool-handle.js')
-rwxr-xr-xjs/stage/tool-handle.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/js/stage/tool-handle.js b/js/stage/tool-handle.js
index d353da47..63cf30e5 100755
--- a/js/stage/tool-handle.js
+++ b/js/stage/tool-handle.js
@@ -585,7 +585,20 @@ exports.TranslateHandle = Montage.create(ToolHandle, {
585 this._origin = pointOnElt; 585 this._origin = pointOnElt;
586 586
587 587
588 var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot); 588 var stage = this.application.ninja.currentDocument.documentRoot;
589 var viewMat = viewUtils.getMatrixFromElement(stage);
590 // Get viewMat without zoom value
591 var zoom = this.application.ninja.documentBar.zoomFactor/100;
592 if(zoom !== 1)
593 {
594 var zoomMatInv = Matrix.create( [
595 [ 1/zoom, 0, 0, 0],
596 [ 0, 1/zoom, 0, 0],
597 [ 0, 0, 1/zoom, 0],
598 [ 0, 0, 0, 1]
599 ] );
600 glmat4.multiply( zoomMatInv, viewMat, viewMat );
601 }
589 602
590 var transMat = viewMat.slice(0); 603 var transMat = viewMat.slice(0);
591 if(inLocalMode) 604 if(inLocalMode)