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

Fix Issue 145: Moving multiple rotated elements has wrong selector box and position 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@502 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-08-30 02:37:16 +00:00
parent bd613bd118
commit 97136649f7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/svgcanvas.js
View File

@ -1409,7 +1409,7 @@ function SvgCanvas(c)
switch (current_mode) switch (current_mode)
{ {
case "select": case "select":
// we temporarily use a translate on the element being dragged // we temporarily use a translate on the element(s) being dragged
// this transform is removed upon mousing up and the element is // this transform is removed upon mousing up and the element is
// relocated to the new location // relocated to the new location
if (selectedElements[0] != null) { if (selectedElements[0] != null) {
@ -1422,7 +1422,6 @@ function SvgCanvas(c)
for (var i = 0; i < len; ++i) { for (var i = 0; i < len; ++i) {
var selected = selectedElements[i]; var selected = selectedElements[i];
if (selected == null) break; if (selected == null) break;
var box = canvas.getBBox(selected); var box = canvas.getBBox(selected);
selectedBBoxes[i].x = box.x + dx; selectedBBoxes[i].x = box.x + dx;
selectedBBoxes[i].y = box.y + dy; selectedBBoxes[i].y = box.y + dy;
@ -1430,16 +1429,17 @@ function SvgCanvas(c)
if (angle) { if (angle) {
var cx = box.x + box.width/2, var cx = box.x + box.width/2,
cy = box.y + box.height/2; cy = box.y + box.height/2;
ts += [" rotate(", angle, " ", cx, ",", cy, ")"].join(''); var xform = ts + [" rotate(", angle, " ", cx, ",", cy, ")"].join('');
var r = Math.sqrt( dx*dx + dy*dy ); var r = Math.sqrt( dx*dx + dy*dy );
var theta = Math.atan2(dy,dx) - angle * Math.PI / 180.0; var theta = Math.atan2(dy,dx) - angle * Math.PI / 180.0;
dx = r * Math.cos(theta); selected.setAttribute("transform", xform);
dy = r * Math.sin(theta); box.x += r * Math.cos(theta); box.y += r * Math.sin(theta);
}
else {
selected.setAttribute("transform", ts);
box.x += dx; box.y += dy;
} }
selected.setAttribute("transform", ts);
// update our internal bbox that we're tracking while dragging // update our internal bbox that we're tracking while dragging
box.x += dx; box.y += dy;
selectorManager.requestSelector(selected).resize(box); selectorManager.requestSelector(selected).resize(box);
} }
} }