aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-20 12:09:54 -0700
committerNivesh Rajbhandari2012-04-20 12:09:54 -0700
commitc5e66f69b108e359b00c8fd897a4278812484c55 (patch)
tree93a5b01192f04c5d8788be30003a961ca842a12d
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>
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js1
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
-rwxr-xr-xjs/stage/tool-handle.js15
-rwxr-xr-xjs/tools/ToolBase.js12
4 files changed, 21 insertions, 9 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 4dc39fd6..66a02725 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -57,7 +57,6 @@ exports.DocumentBar = Montage.create(Component, {
57 this._zoomFactor = value; 57 this._zoomFactor = value;
58 if (!this._firstDraw) 58 if (!this._firstDraw)
59 { 59 {
60 var viewUtils = this.application.ninja.stage.viewUtils;
61 this.application.ninja.stage.setZoom(value); 60 this.application.ninja.stage.setZoom(value);
62 } 61 }
63 } 62 }
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index 3ef7dacc..e9779c81 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -182,5 +182,5 @@ exports.StageController = Montage.create(ElementController, {
182 return dist; 182 return dist;
183 } 183 }
184 } 184 }
185 }, 185 }
186}); 186});
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)
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index 678d03ac..69ac5727 100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
@@ -109,13 +109,13 @@ exports.toolBase = Montage.create(Component, {
109 value:function(event){ 109 value:function(event){
110 var upperBoundary ,previousZoomValue; 110 var upperBoundary ,previousZoomValue;
111 111
112 previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; 112 previousZoomValue = this.application.ninja.documentBar.zoomFactor;
113 upperBoundary = previousZoomValue *1.2 ; 113 upperBoundary = previousZoomValue *1.2 ;
114 114
115 if(upperBoundary > 2000) 115 if(upperBoundary > 2000)
116 this.application.Ninja._documentBarRef.zoomFactor = 2000; 116 this.application.ninja.documentBar.zoomFactor = 2000;
117 else 117 else
118 this.application.Ninja._documentBarRef.zoomFactor*= 1.2; 118 this.application.ninja.documentBar.zoomFactor*= 1.2;
119 119
120 } 120 }
121 }, 121 },
@@ -124,13 +124,13 @@ exports.toolBase = Montage.create(Component, {
124 value:function(){ 124 value:function(){
125 var lowerBoundary ,previousZoomValue; 125 var lowerBoundary ,previousZoomValue;
126 126
127 previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; 127 previousZoomValue = this.application.ninja.documentBar.zoomFactor ;
128 lowerBoundary = previousZoomValue/1.2 ; 128 lowerBoundary = previousZoomValue/1.2 ;
129 129
130 if(lowerBoundary < 25) 130 if(lowerBoundary < 25)
131 this.application.Ninja._documentBarRef.zoomFactor = 25; 131 this.application.ninja.documentBar.zoomFactor = 25;
132 else 132 else
133 this.application.Ninja._documentBarRef.zoomFactor/= 1.2; 133 this.application.ninja.documentBar.zoomFactor/= 1.2;
134 } 134 }
135 }, 135 },
136 136