diff options
author | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
commit | 58e049b68e03abbacde93206d2666361022c0858 (patch) | |
tree | f1ce6b8a378674d4abcac68acd0bcca93b838a39 /js/stage/stage.reel/stage.js | |
parent | a9050f96d814469f420bcf3630d16d576b62258e (diff) | |
parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
download | ninja-58e049b68e03abbacde93206d2666361022c0858.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 5 |
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 | ||