5 files changed, 46 insertions, 36 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index e08ec1da..72e03379 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -12,7 +12,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase,
-    ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
+    ElementsMediator = require("js/mediators/element-mediator").ElementMediator,
+    ShapesController = require("js/controllers/elements/shapes-controller").ShapesController;
 
 exports.FillTool = Montage.create(ModifierToolBase, {
         _canSnap: { value: false },
@@ -28,7 +29,7 @@ exports.FillTool = Montage.create(ModifierToolBase, {
             if (obj)
             {
                 var name = obj.nodeName;
-                if ((name !== 'CANVAS') && (name !== 'DIV'))
+                if ( ((name !== 'CANVAS') && (name !== 'DIV')) || (ShapesController.isElementAShape(obj) && !obj.elementModel.shapeModel.GLGeomObj.canFill))
                 {
                     cursor = "url('images/cursors/nofill.png') 14 14, default";
                     canColor = false;
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index fde09959..413c0302 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -44,10 +44,16 @@ exports.LineTool = Montage.create(ShapeTool, {
             }
 
             this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null);
-            if (this.options.stroke.color)
-                this._strokeColor = this.options.stroke.color.css;
-                        else
-                                this._strokeColor = [0,0,0,1];
+            if (this.options.stroke.color) {
+                if( (this.options.stroke.colorMode === "gradient") || (this.options.stroke.colorMode === "nocolor") ) {
+                    this._strokeColor = [0,0,0,1];
+                } else {
+                    this._strokeColor = this.options.stroke.color.css;
+                }
+            } else {
+                this._strokeColor = [0,0,0,1];
+            }
+
             this.startDraw(event);
         }
     },
@@ -229,10 +235,11 @@ exports.LineTool = Montage.create(ShapeTool, {
             var strokeColor = this.options.stroke.webGlColor;
             // for default stroke and fill/no materials
             var strokeMaterial = null;
+            var strokeM = null;
 
             if(this.options.use3D)
             {
-                var strokeM = this.options.strokeMaterial;
+                strokeM = this.options.strokeMaterial;
                 if(strokeM)
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
@@ -271,7 +278,9 @@ exports.LineTool = Montage.create(ShapeTool, {
             }
 
             // TODO - This needs to be moved into geom obj's init routine instead of here
-            this.setColor(this.options.stroke, null, canvas, "lineTool");
+            if(!strokeM) {
+                this.setColor(canvas, this.options.stroke, false, "lineTool");
+            }
 
             if(canvas.elementModel.isShape)
             {
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 33bf763d..e798d1a7 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -39,23 +39,24 @@ exports.OvalTool = Montage.create(ShapeTool, {
 
             var innerRadius = this.options.innerRadius.value / 100;
 
-            var strokeColor = this.options.stroke.webGlColor;
-            var fillColor = this.options.fill.webGlColor;
-
+            var strokeColor = this.options.stroke.webGlColor || [0,0,0,1];
+            var fillColor = this.options.fill.webGlColor || [1,1,1,1];
             // for default stroke and fill/no materials
             var strokeMaterial = null;
             var fillMaterial = null;
+            var fillM = null;
+            var strokeM = null;
 
             if(this.options.use3D)
             {
-                var strokeM = this.options.strokeMaterial;
+                strokeM = this.options.strokeMaterial;
                 if(strokeM)
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
                 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
 
-                var fillM = this.options.fillMaterial;
+                fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
@@ -95,7 +96,12 @@ exports.OvalTool = Montage.create(ShapeTool, {
             }
 
             // TODO - This needs to be moved into geom obj's init routine instead of here
-            this.setColor(this.options.stroke, this.options.fill, canvas, "ovalTool");
+            if(!fillM) {
+                this.setColor(canvas, this.options.fill, true, "ovalTool");
+            }
+            if(!strokeM) {
+                this.setColor(canvas, this.options.stroke, false, "ovalTool");
+            }
 
             if(canvas.elementModel.isShape)
             {
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index df049395..6f0e65c7 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -59,22 +59,24 @@ exports.RectTool = Montage.create(ShapeTool, {
             var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h);
             var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h);
 
-            var strokeColor = this.options.stroke.webGlColor;
-            var fillColor = this.options.fill.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor || [0,0,0,1];
+            var fillColor = this.options.fill.webGlColor || [1,1,1,1];
             // for default stroke and fill/no materials
             var strokeMaterial = null;
             var fillMaterial = null;
+            var fillM = null;
+            var strokeM = null;
 
             if(this.options.use3D)
             {
-                var strokeM = this.options.strokeMaterial;
+                strokeM = this.options.strokeMaterial;
                 if(strokeM)
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
                 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
 
-                var fillM = this.options.fillMaterial;
+                fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
@@ -118,14 +120,16 @@ exports.RectTool = Montage.create(ShapeTool, {
             }
 
             // TODO - This needs to be moved into geom obj's init routine instead of here
-            this.setColor(this.options.stroke, this.options.fill, canvas, "rectTool");
-
+            if(!fillM) {
+                this.setColor(canvas, this.options.fill, true, "rectTool");
+            }
+            if(!strokeM) {
+                this.setColor(canvas, this.options.stroke, false, "rectTool");
+            }
             if(canvas.elementModel.isShape)
             {
                 this.application.ninja.selectionController.selectElement(canvas);
             }
-
-
         }
     }
 });
\ No newline at end of file
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 6ff61546..3cd75be2 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -211,26 +211,16 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 }
         },
 
-    // We can draw on an existing canvas unless it has only a single shape object
     setColor: {
-        value: function(stroke, fill, canvas, toolId)
+        value: function(canvas, color, isFill, toolId)
         {
-            if(stroke && stroke.color)
+            if(color && color.color)
             {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:stroke.colorMode, color:stroke.color}, false, "Change", toolId);
+                this.application.ninja.elementMediator.setColor([canvas], {mode:color.colorMode, color:color.color}, isFill, "Change", toolId);
             }
             else
             {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:"nocolor", color:null}, false, "Change", toolId);
-            }
-
-            if(fill && fill.color)
-            {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:fill.colorMode, color:fill.color}, true, "Change", toolId);
-            }
-            else
-            {
-                this.application.ninja.elementMediator.setColor([canvas], {mode:"nocolor", color:null}, true, "Change", toolId);
+                this.application.ninja.elementMediator.setColor([canvas], {mode:"nocolor", color:null}, isFill, "Change", toolId);
             }
         }