diff options
Diffstat (limited to 'js/tools/PanTool.js')
-rwxr-xr-x | js/tools/PanTool.js | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js index 6b3dbdbb..d1e96444 100755 --- a/js/tools/PanTool.js +++ b/js/tools/PanTool.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -102,7 +103,7 @@ exports.PanTool = Montage.create(toolBase, | |||
102 | { | 103 | { |
103 | // do one final mouse move to update the scrollbars | 104 | // do one final mouse move to update the scrollbars |
104 | this.mouseUp( event ); | 105 | this.mouseUp( event ); |
105 | 106 | ||
106 | this.application.ninja.stage.clearDrawingCanvas(); | 107 | this.application.ninja.stage.clearDrawingCanvas(); |
107 | this._hasDraw = false; | 108 | this._hasDraw = false; |
108 | this._isDrawing = false; | 109 | this._isDrawing = false; |
@@ -174,7 +175,7 @@ exports.PanTool = Montage.create(toolBase, | |||
174 | this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft += delta; | 175 | this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft += delta; |
175 | 176 | ||
176 | delta *= zoom; | 177 | delta *= zoom; |
177 | 178 | ||
178 | var uc = this.application.ninja.currentDocument.model.documentRoot; | 179 | var uc = this.application.ninja.currentDocument.model.documentRoot; |
179 | var ucMat = viewUtils.getMatrixFromElement(uc); | 180 | var ucMat = viewUtils.getMatrixFromElement(uc); |
180 | var offset = viewUtils.getElementOffset( uc ); | 181 | var offset = viewUtils.getElementOffset( uc ); |
@@ -231,7 +232,7 @@ exports.PanTool = Montage.create(toolBase, | |||
231 | this.doMouseDown( point ); | 232 | this.doMouseDown( point ); |
232 | } | 233 | } |
233 | }, | 234 | }, |
234 | 235 | ||
235 | 236 | ||
236 | doMouseDown: | 237 | doMouseDown: |
237 | { | 238 | { |
@@ -378,7 +379,7 @@ exports.PanTool = Montage.create(toolBase, | |||
378 | 379 | ||
379 | var wPt = MathUtils.transformAndDivideHomogeneousPoint( gPt, this._globalToUCWorld ); | 380 | var wPt = MathUtils.transformAndDivideHomogeneousPoint( gPt, this._globalToUCWorld ); |
380 | var delta = vecUtils.vecSubtract( 3, wPt, this._worldPt ); | 381 | var delta = vecUtils.vecSubtract( 3, wPt, this._worldPt ); |
381 | 382 | ||
382 | if (!this._altKeyDown) | 383 | if (!this._altKeyDown) |
383 | delta[2] = 0; | 384 | delta[2] = 0; |
384 | 385 | ||