From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs

---
 js/tools/OvalTool.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'js/tools/OvalTool.js')

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 94e4745e..e6451a75 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -28,25 +28,25 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var Montage = 	require("montage/core/core").Montage,
+var Montage =   require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
-    ShapesController = 	require("js/controllers/elements/shapes-controller").ShapesController;
+    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
 
 var Circle = require("js/lib/geom/circle").Circle;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 exports.OvalTool = Montage.create(ShapeTool, {
 
-	_toolID: { value: "ovalTool" },
-	_imageID: { value: "ovalToolImg" },
-	_toolImageClass: { value: "ovalToolUp" },
-	_selectedToolImageClass: { value: "ovalToolDown" },
-	_toolTipText: { value: "Oval Tool (O)" },
+    _toolID: { value: "ovalTool" },
+    _imageID: { value: "ovalToolImg" },
+    _toolImageClass: { value: "ovalToolUp" },
+    _selectedToolImageClass: { value: "ovalToolDown" },
+    _toolTipText: { value: "Oval Tool (O)" },
     _selectedToolClass:{value:"ovalToolSpecificProperties"},
     _ovalView : { value: null, writable: true},
 
     RenderShape: {
-		value: function (w, h, planeMat, midPt, canvas)
+        value: function (w, h, planeMat, midPt, canvas)
         {
             if( (Math.floor(w) === 0) || (Math.floor(h) === 0) )
             {
-- 
cgit v1.2.3


From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:53:10 -0700
Subject: Remove trailing spaces

---
 js/tools/OvalTool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/tools/OvalTool.js')

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e6451a75..4c78973d 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -52,7 +52,7 @@ exports.OvalTool = Montage.create(ShapeTool, {
             {
                 return;
             }
-            
+
             var left = Math.round(midPt[0] - 0.5*w);
             var top = Math.round(midPt[1] - 0.5*h);
 
-- 
cgit v1.2.3


From ac27d538af33ca8d67d3d88729f49c05793afda7 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 9 Jul 2012 11:43:36 -0700
Subject: PI, drawing and editing fixes for shapes and materials.

IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color.

IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material.

IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat.

IKNINJA-1886 - Gradient edits not applied to WebGL Stage object.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/tools/OvalTool.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'js/tools/OvalTool.js')

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e798d1a7..f1e33205 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -54,14 +54,22 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
+                    strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
+                } else {
+                    strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                }
 
                 fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
                 }
-                fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
+                if (fillMaterial && this.options.fill.color && (fillMaterial.gradientType === this.options.fill.color.gradientMode)) {
+                    fillColor = {gradientMode:fillMaterial.gradientType, color:this.options.fill.color.stops};
+                } else {
+                    fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
+                }
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
-- 
cgit v1.2.3