aboutsummaryrefslogtreecommitdiff
path: root/js/tools/OvalTool.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-10 11:24:21 -0700
committerJose Antonio Marquez2012-04-10 11:24:21 -0700
commitd14f78b06d37aa469885f2ecf84419bcb7e3e613 (patch)
tree91b95c6c9aef779a743b710105546a8ae74bff12 /js/tools/OvalTool.js
parenta9bcc403df76ad2cb7c31ff7fdd42a85c35cf424 (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-d14f78b06d37aa469885f2ecf84419bcb7e3e613.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/tools/OvalTool.js')
-rwxr-xr-xjs/tools/OvalTool.js15
1 files changed, 2 insertions, 13 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index a10e0bb5..e8e88d1d 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -53,12 +53,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
53 { 53 {
54 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 54 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
55 } 55 }
56 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
56 57
57 var fillM = this.options.fillMaterial; 58 var fillM = this.options.fillMaterial;
58 if(fillM) 59 if(fillM)
59 { 60 {
60 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); 61 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
61 } 62 }
63 fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
62 } 64 }
63 65
64 var world = this.getGLWorld(canvas, this.options.use3D); 66 var world = this.getGLWorld(canvas, this.options.use3D);
@@ -78,22 +80,9 @@ exports.OvalTool = Montage.create(ShapeTool, {
78 canvas.elementModel.selection = "Oval"; 80 canvas.elementModel.selection = "Oval";
79 canvas.elementModel.pi = "OvalPi"; 81 canvas.elementModel.pi = "OvalPi";
80 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; 82 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
81 canvas.elementModel.shapeModel.stroke = strokeColor;
82 canvas.elementModel.shapeModel.fill = fillColor;
83 if(strokeColor)
84 {
85 canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
86 }
87 if(fillColor)
88 {
89 canvas.elementModel.shapeModel.background = this.application.ninja.colorController.colorToolbar.fill;
90 }
91 83
92 canvas.elementModel.shapeModel.innerRadius = this.options.innerRadius.value + " " + this.options.innerRadius.units; 84 canvas.elementModel.shapeModel.innerRadius = this.options.innerRadius.value + " " + this.options.innerRadius.units;
93 85
94 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
95 canvas.elementModel.shapeModel.fillMaterial = fillMaterial;
96
97 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; 86 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
98 canvas.elementModel.shapeModel.strokeStyle = strokeStyle; 87 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
99 88