diff options
author | Ananya Sen | 2012-06-07 11:59:32 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-07 11:59:32 -0700 |
commit | 7378b6846f140106490f10c02cd7cec6a19023aa (patch) | |
tree | 90b60c007696b4a73c29abbae82562f69f15c11a /js/helper-classes/3D/draw-utils.js | |
parent | aea0e6879abfef02a827ed239ef091c3b96d6eb2 (diff) | |
parent | b75fe9369f7caec0351d298f7106c8d59572b440 (diff) | |
download | ninja-7378b6846f140106490f10c02cd7cec6a19023aa.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/helper-classes/3D/draw-utils.js')
-rwxr-xr-x | js/helper-classes/3D/draw-utils.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js index a793b643..bef1e435 100755 --- a/js/helper-classes/3D/draw-utils.js +++ b/js/helper-classes/3D/draw-utils.js | |||
@@ -1206,7 +1206,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
1206 | // set the element to be the viewport object - temporarily | 1206 | // set the element to be the viewport object - temporarily |
1207 | var tmpCanvas = this.application.ninja.stage.canvas; | 1207 | var tmpCanvas = this.application.ninja.stage.canvas; |
1208 | var tmpStage = this.application.ninja.currentDocument.model.documentRoot; | 1208 | var tmpStage = this.application.ninja.currentDocument.model.documentRoot; |
1209 | this.viewUtils.pushViewportObj( tmpCanvas ); | 1209 | // this.viewUtils.pushViewportObj( tmpCanvas ); |
1210 | 1210 | ||
1211 | // save the source space object and set to the target object | 1211 | // save the source space object and set to the target object |
1212 | var saveSource = this._sourceSpaceElt; | 1212 | var saveSource = this._sourceSpaceElt; |
@@ -1217,7 +1217,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
1217 | var saveLineWidth = this._lineWidth; | 1217 | var saveLineWidth = this._lineWidth; |
1218 | 1218 | ||
1219 | var origLeft = 60; | 1219 | var origLeft = 60; |
1220 | var origTop = this.snapManager.getStageHeight() - 60; | 1220 | var origTop = tmpCanvas.height - 60; |
1221 | 1221 | ||
1222 | var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt ); | 1222 | var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt ); |
1223 | var tMat = Matrix.Translation([origLeft,origTop,0]); | 1223 | var tMat = Matrix.Translation([origLeft,origTop,0]); |
@@ -1279,7 +1279,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
1279 | this.drawArrowHead(rO, zO); | 1279 | this.drawArrowHead(rO, zO); |
1280 | 1280 | ||
1281 | // restore the state | 1281 | // restore the state |
1282 | this.viewUtils.popViewportObj(); | 1282 | // this.viewUtils.popViewportObj(); |
1283 | this._drawingContext.restore(); | 1283 | this._drawingContext.restore(); |
1284 | this.setDrawingSurfaceElement(saveContext); | 1284 | this.setDrawingSurfaceElement(saveContext); |
1285 | this._lineColor = saveColor; | 1285 | this._lineColor = saveColor; |