zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed zoom calculations for Firefox. See https://groups.google.com/forum/#!topic/svg-edit/cvrwclZVeGI and Issue 1046 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2524 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Ben McDonald 2013-08-21 06:20:22 +00:00
parent 3b9b729194
commit c3bea689b2
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/svgcanvas.js
View File

@ -1293,17 +1293,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
svgCanvas.cloneSelectedElements(0, 0); svgCanvas.cloneSelectedElements(0, 0);
} }
root_sctm = svgcontent.getScreenCTM().inverse(); root_sctm = $('#svgcontent g')[0].getScreenCTM().inverse();
// Firefox issue 1046
if (current_zoom != 1 && root_sctm.a == 1) {
matrix_e = root_sctm.e / current_zoom - root_sctm.e;
matrix_f = root_sctm.f / current_zoom - root_sctm.f;
matrix_scale = 1/current_zoom;
root_sctm = svgcontent.getScreenCTM().inverse()
.translate(matrix_e, matrix_f)
.scale(matrix_scale);
}
var pt = svgedit.math.transformPoint( evt.pageX, evt.pageY, root_sctm ), var pt = svgedit.math.transformPoint( evt.pageX, evt.pageY, root_sctm ),
mouse_x = pt.x * current_zoom, mouse_x = pt.x * current_zoom,
@ -2451,7 +2441,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
e.preventDefault(); e.preventDefault();
var evt = e.originalEvent; var evt = e.originalEvent;
root_sctm = svgcontent.getScreenCTM().inverse(); root_sctm = $('#svgcontent g')[0].getScreenCTM().inverse();
var pt = svgedit.math.transformPoint( evt.pageX, evt.pageY, root_sctm ); var pt = svgedit.math.transformPoint( evt.pageX, evt.pageY, root_sctm );
var bbox = { var bbox = {