aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-04-10 08:13:00 -0700
committerJonathan Duran2012-04-10 08:13:00 -0700
commit58e049b68e03abbacde93206d2666361022c0858 (patch)
treef1ce6b8a378674d4abcac68acd0bcca93b838a39 /js/stage/stage.reel
parenta9050f96d814469f420bcf3630d16d576b62258e (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-58e049b68e03abbacde93206d2666361022c0858.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-xjs/stage/stage.reel/stage.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 3500b6a3..ec8c0e55 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -795,6 +795,8 @@ exports.Stage = Montage.create(Component, {
795 drawLine: { 795 drawLine: {
796 value:function(x0, y0, x1, y1, strokeSize, strokeColor) { 796 value:function(x0, y0, x1, y1, strokeSize, strokeColor) {
797 this.clearDrawingCanvas(); 797 this.clearDrawingCanvas();
798 var origStrokeStyle = this._drawingContext.strokeStyle;
799 var origLineWidth = this._drawingContext.lineWidth;
798 this._drawingContext.strokeStyle = strokeColor; 800 this._drawingContext.strokeStyle = strokeColor;
799 this._drawingContext.lineWidth = strokeSize; 801 this._drawingContext.lineWidth = strokeSize;
800 802
@@ -825,6 +827,9 @@ exports.Stage = Montage.create(Component, {
825 var w = Math.round(Math.abs(x1-x0)); 827 var w = Math.round(Math.abs(x1-x0));
826 this._drawingContext.fillText("H: " + h, txtX + 38, txtY - 4); 828 this._drawingContext.fillText("H: " + h, txtX + 38, txtY - 4);
827 this._drawingContext.fillText("W: " + w, txtX - 5, txtY + 12); 829 this._drawingContext.fillText("W: " + w, txtX - 5, txtY + 12);
830
831 this._drawingContext.strokeStyle = origStrokeStyle;
832 this._drawingContext.lineWidth = origLineWidth;
828 } 833 }
829 }, 834 },
830 835