diff options
author | Jose Antonio Marquez Russo | 2012-02-01 17:11:21 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-02-01 17:11:21 -0800 |
commit | 83ac41dd75ec551cdb03252e0bf3081182517d05 (patch) | |
tree | 75781b24936e90c815f13dd5d2158c65fef643e3 /js/tools/LineTool.js | |
parent | 9c317ebb46e82a00b83eb732c73ae39ce9ef46b9 (diff) | |
parent | 830b011d94d728882286d72e129f7405134957c7 (diff) | |
download | ninja-83ac41dd75ec551cdb03252e0bf3081182517d05.tar.gz |
Merge pull request #2 from mqg734/NiveshColor
Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes.
Diffstat (limited to 'js/tools/LineTool.js')
-rw-r--r-- | js/tools/LineTool.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 042ba0b2..a0d5a182 100644 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -225,6 +225,10 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
225 | canvas.elementModel.pi = "LinePi"; | 225 | canvas.elementModel.pi = "LinePi"; |
226 | canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; | 226 | canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; |
227 | canvas.elementModel.shapeModel.stroke = strokeColor; | 227 | canvas.elementModel.shapeModel.stroke = strokeColor; |
228 | if(strokeColor) | ||
229 | { | ||
230 | canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke; | ||
231 | } | ||
228 | 232 | ||
229 | canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; | 233 | canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; |
230 | canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex; | 234 | canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex; |