diff options
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 00b72490..ec8c0e55 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -560,8 +560,7 @@ exports.Stage = Montage.create(Component, { | |||
560 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 560 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
561 | 561 | ||
562 | // workaround Chrome 3d bug | 562 | // workaround Chrome 3d bug |
563 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) | 563 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) { |
564 | { | ||
565 | return this._getElementUsingSnapping(point); | 564 | return this._getElementUsingSnapping(point); |
566 | } else { | 565 | } else { |
567 | return elt; | 566 | return elt; |
@@ -605,7 +604,7 @@ exports.Stage = Montage.create(Component, { | |||
605 | var selArray = new Array(); | 604 | var selArray = new Array(); |
606 | 605 | ||
607 | for(var i = 0; this.application.ninja.selectedElements[i];i++) { | 606 | for(var i = 0; this.application.ninja.selectedElements[i];i++) { |
608 | var curElement = this.application.ninja.selectedElements[i]._element; | 607 | var curElement = this.application.ninja.selectedElements[i]; |
609 | 608 | ||
610 | // Add element to array that is used to calculate 3d-bounding box of all elements | 609 | // Add element to array that is used to calculate 3d-bounding box of all elements |
611 | selArray.push( curElement ); | 610 | selArray.push( curElement ); |
@@ -796,6 +795,8 @@ exports.Stage = Montage.create(Component, { | |||
796 | drawLine: { | 795 | drawLine: { |
797 | value:function(x0, y0, x1, y1, strokeSize, strokeColor) { | 796 | value:function(x0, y0, x1, y1, strokeSize, strokeColor) { |
798 | this.clearDrawingCanvas(); | 797 | this.clearDrawingCanvas(); |
798 | var origStrokeStyle = this._drawingContext.strokeStyle; | ||
799 | var origLineWidth = this._drawingContext.lineWidth; | ||
799 | this._drawingContext.strokeStyle = strokeColor; | 800 | this._drawingContext.strokeStyle = strokeColor; |
800 | this._drawingContext.lineWidth = strokeSize; | 801 | this._drawingContext.lineWidth = strokeSize; |
801 | 802 | ||
@@ -826,6 +827,9 @@ exports.Stage = Montage.create(Component, { | |||
826 | var w = Math.round(Math.abs(x1-x0)); | 827 | var w = Math.round(Math.abs(x1-x0)); |
827 | this._drawingContext.fillText("H: " + h, txtX + 38, txtY - 4); | 828 | this._drawingContext.fillText("H: " + h, txtX + 38, txtY - 4); |
828 | 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; | ||
829 | } | 833 | } |
830 | }, | 834 | }, |
831 | 835 | ||