Merge branch 'master' into pentool

1 files changed, 8 insertions, 0 deletions

diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index fbf1693e..94d80b53 100644
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -94,6 +94,14 @@ exports.RectTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
                 canvas.elementModel.shapeModel.stroke = strokeColor;
                 canvas.elementModel.shapeModel.fill = fillColor;
+                if(strokeColor)
+                {
+                    canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                }
+                if(fillColor)
+                {
+                    canvas.elementModel.shapeModel.background = this.application.ninja.colorController.colorToolbar.fill;
+                }
 
                 canvas.elementModel.shapeModel.tlRadius = this.options.TLRadiusControl.value + " " + this.options.TLRadiusControl.units;
                 canvas.elementModel.shapeModel.trRadius = this.options.TRRadiusControl.value + " " + this.options.TRRadiusControl.units;