aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/shapes-controller.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-13 09:56:40 -0800
committerNivesh Rajbhandari2012-02-13 09:56:40 -0800
commit2edf68e0de786cdc92d5f41548fd61e6c77a57ec (patch)
tree036b7ea15a75dca9abb04b5d44a9b41b066087a6 /js/controllers/elements/shapes-controller.js
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-2edf68e0de786cdc92d5f41548fd61e6c77a57ec.tar.gz
Updated ink bottle tool to use new setColor routine in the mediator and controllers.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
-rw-r--r--js/controllers/elements/shapes-controller.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 640119c4..42c2528f 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -260,6 +260,14 @@ exports.ShapesController = Montage.create(CanvasController, {
260 el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl); 260 el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);
261 this.setShapeProperty(el, "stroke", webGl); 261 this.setShapeProperty(el, "stroke", webGl);
262 this.setShapeProperty(el, "border", color); 262 this.setShapeProperty(el, "border", color);
263 if(color.strokeInfo)
264 {
265 var strokeWidth = this.GetValueInPixels(color.strokeInfo.strokeSize,
266 color.strokeInfo.strokeUnits);
267 el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(strokeWidth);
268 this.setShapeProperty(el, "strokeSize", color.strokeInfo.strokeSize + " "
269 + color.strokeInfo.strokeUnits);
270 }
263 } 271 }
264 el.elementModel.shapeModel.GLWorld.render(); 272 el.elementModel.shapeModel.GLWorld.render();
265 } 273 }