aboutsummaryrefslogtreecommitdiff
path: root/js/stage/tool-handle.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-20 12:09:54 -0700
committerNivesh Rajbhandari2012-04-20 12:09:54 -0700
commitc5e66f69b108e359b00c8fd897a4278812484c55 (patch)
tree93a5b01192f04c5d8788be30003a961ca842a12d /js/stage/tool-handle.js
parent5cca0aa1d99121def2349b881d2cffddd2816ba9 (diff)
downloadninja-c5e66f69b108e359b00c8fd897a4278812484c55.tar.gz
Fixing translate handles to draw without zoom value. Also fixed some typos in zoom code.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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)