aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-08 16:03:17 -0800
committerPushkar Joshi2012-03-08 16:03:17 -0800
commitfcab2a14f8de302948d38f55db41e2c1c92baa34 (patch)
tree992992a43e0cff5fab528a84448fd01328077392 /js/components/tools-properties
parent703fb3d06e88257ac73c1d1a0ec6ca33a64f4371 (diff)
downloadninja-fcab2a14f8de302948d38f55db41e2c1c92baa34.tar.gz
brush stroke options for calligraphic brush style
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html23
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js8
2 files changed, 28 insertions, 3 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 6d4852e6..d96bd1ba 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -37,6 +37,19 @@
37 } 37 }
38 }, 38 },
39 39
40 "strokeAngleHT": {
41 "module": "js/components/hottextunit.reel",
42 "name": "HotTextUnit",
43 "properties": {
44 "element": {"#": "strokeAngle"},
45 "minValue": -90,
46 "maxValue": 90,
47 "value": 0,
48 "decimalPlace": 10,
49 "acceptableUnits" : ["px", "pt"]
50 }
51 },
52
40 "owner": { 53 "owner": {
41 "module": "js/components/tools-properties/brush-properties.reel", 54 "module": "js/components/tools-properties/brush-properties.reel",
42 "name": "BrushProperties", 55 "name": "BrushProperties",
@@ -44,7 +57,9 @@
44 "element": {"#": "brushProperties"}, 57 "element": {"#": "brushProperties"},
45 "_strokeSize": {"@": "strokeSizeHT"}, 58 "_strokeSize": {"@": "strokeSizeHT"},
46 "_strokeHardness": {"@": "strokeHardnessHT"}, 59 "_strokeHardness": {"@": "strokeHardnessHT"},
47 "_doSmoothing": {"@": "doSmoothing"} 60 "_doSmoothing": {"#": "doSmoothing"},
61 "_useCalligraphic":{"#": "useCalligraphic"},
62 "_strokeAngle": {"@": "strokeAngleHT"}
48 } 63 }
49 } 64 }
50 } 65 }
@@ -59,7 +74,11 @@
59 <div id="strokeSize" class="label"></div> 74 <div id="strokeSize" class="label"></div>
60 <label class="label"> Hardness:</label> 75 <label class="label"> Hardness:</label>
61 <div id="strokeHardness" class="label"></div> 76 <div id="strokeHardness" class="label"></div>
62 <label class="label subOption optionLabel"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> 77 <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
78 <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
79 <label class="label"> Angle:</label>
80 <div id="strokeAngle" class="label"></div>
81
63 </div> 82 </div>
64 </div> 83 </div>
65 </body> 84 </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 0ce685b5..e6faa0f0 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -16,6 +16,12 @@ exports.BrushProperties = Montage.create(ToolProperties, {
16 get: function() { return this._strokeHardness; } 16 get: function() { return this._strokeHardness; }
17 }, 17 },
18 doSmoothing:{ 18 doSmoothing:{
19 get: function() {return this._doSmoothing; } 19 get: function() {return this._doSmoothing.checked; }
20 },
21 useCalligraphic: {
22 get: function() {return this._useCalligraphic.checked;}
23 },
24 strokeAngle: {
25 get: function() {return this._strokeAngle;}
20 } 26 }
21}); 27});