diff options
author | Ananya Sen | 2012-04-26 12:57:56 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-26 12:57:56 -0700 |
commit | b2132103b12e499f26e6e0f311d48555a9f733ff (patch) | |
tree | 2eaa000b460e4be3c8050a369318584b2591e8d7 /js/stage/tool-handle.js | |
parent | 07c611323c109aaa2208ebc15a354b81c3f04a0d (diff) | |
parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
download | ninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/stage/tool-handle.js')
-rwxr-xr-x | js/stage/tool-handle.js | 15 |
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) |