From c3bea689b207675a66166a648d9b3684d06a1798 Mon Sep 17 00:00:00 2001 From: Ben McDonald Date: Wed, 21 Aug 2013 06:20:22 +0000 Subject: [PATCH] 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 --- editor/svgcanvas.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js index 45238e05..4d311967 100644 --- a/editor/svgcanvas.js +++ b/editor/svgcanvas.js @@ -1293,17 +1293,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) { svgCanvas.cloneSelectedElements(0, 0); } - root_sctm = svgcontent.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); - } + root_sctm = $('#svgcontent g')[0].getScreenCTM().inverse(); var pt = svgedit.math.transformPoint( evt.pageX, evt.pageY, root_sctm ), mouse_x = pt.x * current_zoom, @@ -2451,7 +2441,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) { e.preventDefault(); 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 bbox = {