Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II

Conflicts:
	js/helper-classes/3D/view-utils.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js
	js/tools/Translate3DToolBase.js

1 files changed, 259 insertions, 136 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index c9164e3e..14cdc473 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -13,12 +13,74 @@ var Montage = 			require("montage/core/core").Montage,
 exports.ShapesController = Montage.create(CanvasController, {
 
     setProperty: {
-        value: function(el, p, value) {
-            var val = parseInt(value);
+        value: function(el, p, value, eventType, source) {
+            var val = parseInt(value),
+                canvas,
+                m,
+                color;
             switch(p) {
                 case "strokeSize":
                     // TODO - For now, just handling px units.
                     this.setShapeProperty(el, "strokeSize", value);
+                    // TODO - For now, just handle Line, Rectangle and Oval. Eventually, move this into each class's
+                    // setStrokeWidth code like SubPath and BrushStroke do.
+                    var geomType = el.elementModel.shapeModel.GLGeomObj.geomType();
+                    if( (geomType > 0) && (geomType < 4) )
+                    {
+                        // Changing stroke size should grow/shrink the shape from the center.
+                        var delta = ~~(val - el.elementModel.shapeModel.GLGeomObj.getStrokeWidth()),
+                            l = this.application.ninja.elementMediator.getProperty(el, "left", parseInt),
+                            t = this.application.ninja.elementMediator.getProperty(el, "top", parseInt),
+                            w = this.application.ninja.elementMediator.getProperty(el, "width", parseInt),
+                            h = this.application.ninja.elementMediator.getProperty(el, "height", parseInt);
+
+                        if(geomType === 3)
+                        {
+                            var slope = el.elementModel.shapeModel.slope;
+                            // set the dimensions
+                            if(slope === "horizontal")
+                            {
+                                h = Math.max(val, 1);
+                                t -= ~~(delta/2);
+                            }
+                            else if(slope === "vertical")
+                            {
+                                w = Math.max(val, 1);
+                                l -= ~~(delta/2);
+                            }
+                            else
+                            {
+                                var oldXAdj = el.elementModel.shapeModel.GLGeomObj.getXAdj();
+                                var oldYAdj = el.elementModel.shapeModel.GLGeomObj.getYAdj();
+                                var theta = Math.atan(el.elementModel.shapeModel.slope);
+                                var xAdj = Math.abs((val/2)*Math.sin(theta));
+                                var yAdj = Math.abs((val/2)*Math.cos(theta));
+                                var dX = ~~(xAdj*2 - oldXAdj*2);
+                                var dY = ~~(yAdj*2 - oldYAdj*2);
+
+                                l -= dX;
+                                t -= dY;
+                                w += dX*2;
+                                h += dY*2;
+
+                                el.elementModel.shapeModel.GLGeomObj.setXAdj(xAdj);
+                                el.elementModel.shapeModel.GLGeomObj.setYAdj(yAdj);
+                            }
+                        }
+                        else
+                        {
+                            l -= ~~(delta/2);
+                            t -= ~~(delta/2);
+                            w += delta;
+                            h += delta;
+                        }
+                        this.application.ninja.elementMediator.setProperties([el],
+                                                                            { "left": [l + "px"],
+                                                                              "top": [t + "px"],
+                                                                              "width": [w + "px"],
+                                                                              "height": [h + "px"] },
+                                                                            eventType, source );
+                    }
                     el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                     el.elementModel.shapeModel.GLWorld.render();
@@ -68,43 +130,47 @@ exports.ShapesController = Montage.create(CanvasController, {
                     el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "useWebGl":
-                    var canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
+                    canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
                     canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                     canvas.width = el.width;
                     canvas.height = el.height;
                     canvas.elementModel = el.elementModel;
-                    this.application.ninja.currentDocument.documentRoot.replaceChild(canvas, el);
-                    NJevent("elementsRemoved", el);
-                    el = canvas;
-                    this.toggleWebGlMode(el, value);
-                    el.elementModel.shapeModel.GLWorld.render();
-                    this.application.ninja.selectionController.selectElement(el);
-                    return;
+                    this.toggleWebGlMode(canvas, value);
+                    this.application.ninja.elementMediator.replaceElement(canvas, el);
+                    break;
                 case "strokeMaterial":
-                    var sm = Object.create(MaterialsModel.getMaterial(value));
-                    if(sm)
+                    m = Object.create(MaterialsModel.getMaterial(value));
+                    if(m)
                     {
-                        el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm);
-                        el.elementModel.shapeModel.strokeMaterial = sm;
+                        el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(m);
+                        color = this.getMaterialColor(value);
+                        if(color)
+                        {
+                            el.elementModel.shapeModel.GLGeomObj.setStrokeColor(color);
+                        }
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                         el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 case "fillMaterial":
-                    var fm = Object.create(MaterialsModel.getMaterial(value));
-                    if(fm)
+                    m = Object.create(MaterialsModel.getMaterial(value));
+                    if(m)
                     {
-                        el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
-                        el.elementModel.shapeModel.fillMaterial = fm;
+                        el.elementModel.shapeModel.GLGeomObj.setFillMaterial(m);
+                        color = this.getMaterialColor(value);
+                        if(color)
+                        {
+                            el.elementModel.shapeModel.GLGeomObj.setFillColor(color);
+                        }
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                         el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 case "editStrokeMaterial":
-                    NJevent("showMaterialPopup",{materialId : el.elementModel.shapeModel.strokeMaterial.getName()});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial")});
                     break;
                 case "editFillMaterial":
-                    NJevent("showMaterialPopup",{materialId : el.elementModel.shapeModel.fillMaterial.getName()});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial")});
                     break;
                 case "animate":
                     if(value)
@@ -148,6 +214,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 default:
                     CanvasController.setProperty(el, p, value);
             }
+            this.application.ninja.documentController.activeDocument.needsSave = true;
         }
     },
 
@@ -160,11 +227,13 @@ exports.ShapesController = Montage.create(CanvasController, {
                 case "trRadius":
                 case "blRadius":
                 case "brRadius":
-                case "border":
-                case "background":
                 case "useWebGl":
                 case "animate":
                     return this.getShapeProperty(el, p);
+                case "border":
+                    return this.getColor(el, false);
+                case "background":
+                    return this.getColor(el, true);
                 case "strokeHardness":
                     if (el.elementModel && el.elementModel.shapeModel){
                         return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();
@@ -203,11 +272,20 @@ exports.ShapesController = Montage.create(CanvasController, {
                 
 
                 case "strokeMaterial":
+                    var sm = el.elementModel.shapeModel.GLGeomObj.getStrokeMaterial();
+                    if(sm)
+                    {
+                        return sm.getName();
+                    }
+                    else
+                    {
+                        return "FlatMaterial";