Integrating Zoom tool fixes.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

2 files changed, 7 insertions, 2 deletions

diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index ca2a8bf3..2b312e53 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -131,9 +131,14 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
            var iMat = Matrix.I(4);
 
            ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot, iMat, false);
-
            this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null;
 
+                        // let the document and stage manager know about the zoom change
+                        this.application.ninja.stage._firstDraw = true;
+                        this.application.ninja.documentBar.zoomFactor = 100;
+                        this.application.ninja.currentDocument.iframe.style.zoom = 1.0;
+                        this.application.ninja.stage._firstDraw = false;
+
            // TODO - Any updates to the stage should redraw stage's children. Move this to mediator?
            this.application.ninja.stage.updatedStage = true;
 
diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js
index 4b6705c1..93caf984 100755
--- a/js/tools/ZoomTool.js
+++ b/js/tools/ZoomTool.js
@@ -146,7 +146,7 @@ exports.ZoomTool = Montage.create(DrawingTool, {
                         var dx = Math.abs(point.x - this.downPoint.x),
                                 dy = Math.abs(point.y - this.downPoint.y);
 
-                        if ((dx >= 4) || (dy >= 4))
+                        if ((dx >= 10) || (dy >= 10))
                         {
                                 // Drawing the Marquee
                                 if(this.options.selectedElement==="zoomInTool")