From 1a759361b82127f9d5c1428dc889fffdf2daaf86 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 3 May 2012 15:11:56 -0700
Subject: First round of moving color chips into the sub tools. Shape and Pen
tool now have chips in the sub tool bar. Still need to complete adding chips
to the Brush tool and finalizing the subtool bar layout to our spec for all
of the subtools.
---
js/tools/PenTool.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'js/tools/PenTool.js')
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 8ecc9f79..83d0c8d2 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -240,7 +240,7 @@ exports.PenTool = Montage.create(ShapeTool, {
this._selectedSubpath.setStrokeWidth(strokeSize);
var colorArray=[];
- var color = this.application.ninja.colorController.colorToolbar.stroke.color;
+ var color = this.options.stroke.color;
if (color){
colorArray = [color.r/255, color.g/255, color.b/255, color.a];
}else {
@@ -248,7 +248,7 @@ exports.PenTool = Montage.create(ShapeTool, {
}
this._selectedSubpath.setStrokeColor(colorArray);
- color = this.application.ninja.colorController.colorToolbar.fill.color;
+ color = this.options.fill.color;
if (color){
colorArray = [color.r/255, color.g/255, color.b/255, color.a];
} else {
--
cgit v1.2.3
From ba64dfa1d64969e290f15459a826171468fe3550 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 10 May 2012 15:10:58 -0700
Subject: put color chips in the inkbottle and fill tool
---
js/tools/PenTool.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/tools/PenTool.js')
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index e70bed27..10eb03c9 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -592,7 +592,7 @@ exports.PenTool = Montage.create(ShapeTool, {
var strokeColor = subpath.getStrokeColor();
newCanvas.elementModel.shapeModel.stroke = strokeColor;
if(strokeColor) {
- newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+ newCanvas.elementModel.shapeModel.border = this.options.stroke;
}
newCanvas.elementModel.shapeModel.GLGeomObj = subpath;
newCanvas.elementModel.shapeModel.useWebGl = false;//this.options.use3D;
--
cgit v1.2.3