Switching to Linear/RadialGradient materials will set the corresponding color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly.

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

4 files changed, 5 insertions, 32 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 499a6b9d..9b22c629 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -216,7 +216,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = this._getMaterialColor(strokeM) || strokeColor;
+                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index c09c9bc7..e8e88d1d 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -53,14 +53,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = this._getMaterialColor(strokeM) || strokeColor;
+                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
 
                 var fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
                 }
-                fillColor = this._getMaterialColor(fillM) || fillColor;
+                fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index d69aa933..0c14a559 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -72,14 +72,14 @@ exports.RectTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = this._getMaterialColor(strokeM) || strokeColor;
+                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
 
                 var fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
                 }
-                fillColor = this._getMaterialColor(fillM) || fillColor;
+                fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 1a12401f..85009bc2 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -206,33 +206,6 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         }
     },
 
-    _getMaterialColor: {
-        value: function(m)
-        {
-            var css,
-                colorObj;
-            if(m === "LinearGradientMaterial")
-            {
-                css = "-webkit-gradient(linear, left top, right top, from(rgb(255, 0, 0)), color-stop(0.3, rgb(0, 255, 0)), color-stop(0.6, rgb(0, 0, 255)), to(rgb(0, 255, 255)))";
-            }
-            else if(m === "RadialGradientMaterial")
-            {
-                css = "-webkit-radial-gradient(50% 50%, ellipse cover, rgb(255, 0, 0) 0%, rgb(0, 255, 0) 30%, rgb(0, 0, 255) 60%, rgb(0, 255, 255) 100%)";
-            }
-
-            if(css)
-            {
-                colorObj = this.application.ninja.colorController.getColorObjFromCss(css);
-                if(colorObj)
-                {
-                    return {gradientMode:colorObj.color.gradientMode, color:colorObj.color.stops};
-                }
-            }
-
-            return null;
-        }
-    },
-
         // We can draw on an existing canvas unless it has only a single shape object
         _useExistingCanvas: {
                 value: function()