aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-07 14:33:21 -0800
committerPushkar Joshi2012-03-07 14:33:21 -0800
commit703fb3d06e88257ac73c1d1a0ec6ca33a64f4371 (patch)
tree440d068584f7ccda73368b4857189f8b528e6416 /js/components
parent353bfa04a6153b0146a0c73b6e6bb0e5f4b23194 (diff)
downloadninja-703fb3d06e88257ac73c1d1a0ec6ca33a64f4371.tar.gz
implement stroke hardness such that it is percentage of the stroke width that's fully the color of the brush
AND add a smoothing flag for the brush options
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html4
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js3
2 files changed, 6 insertions, 1 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index af07b3f2..6d4852e6 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -43,7 +43,8 @@
43 "properties": { 43 "properties": {
44 "element": {"#": "brushProperties"}, 44 "element": {"#": "brushProperties"},
45 "_strokeSize": {"@": "strokeSizeHT"}, 45 "_strokeSize": {"@": "strokeSizeHT"},
46 "_strokeHardness": {"@": "strokeHardnessHT"} 46 "_strokeHardness": {"@": "strokeHardnessHT"},
47 "_doSmoothing": {"@": "doSmoothing"}
47 } 48 }
48 } 49 }
49 } 50 }
@@ -58,6 +59,7 @@
58 <div id="strokeSize" class="label"></div> 59 <div id="strokeSize" class="label"></div>
59 <label class="label"> Hardness:</label> 60 <label class="label"> Hardness:</label>
60 <div id="strokeHardness" class="label"></div> 61 <div id="strokeHardness" class="label"></div>
62 <label class="label subOption optionLabel"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
61 </div> 63 </div>
62 </div> 64 </div>
63 </body> 65 </body>
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js
index d2fcf888..0ce685b5 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -14,5 +14,8 @@ exports.BrushProperties = Montage.create(ToolProperties, {
14 }, 14 },
15 strokeHardness: { 15 strokeHardness: {
16 get: function() { return this._strokeHardness; } 16 get: function() { return this._strokeHardness; }
17 },
18 doSmoothing:{
19 get: function() {return this._doSmoothing; }
17 } 20 }
18}); 21});