diff options
author | Jon Reid | 2012-04-10 14:52:23 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-10 14:52:23 -0700 |
commit | c19987997758cf47ac9b93a2a767a0e2a9072745 (patch) | |
tree | eb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/stage/stage.reel/stage.js | |
parent | 03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff) | |
parent | 422b14fc60be84c116115f2e71e3499e232f3f05 (diff) | |
download | ninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 | ||