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

Fix bug when changing positon of a rotated element via contextual panel 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@449 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-08-23 03:18:59 +00:00
parent 96cc518072
commit c170ea5905
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/svgcanvas.js
View File

@ -1,7 +1,8 @@
/* /*
TODOs for Rotator: TODOs for Rotator:
- resize rotated elements must work properly with the selector (aligned to the axis of rotation) - resize with negative width/height causes problems with selector (and upon release, kablooie)
- fix resize when mouseup
- show the proper resize cursor based on the rotation - show the proper resize cursor based on the rotation
- add a rotator line/handle to the selector group - add a rotator line/handle to the selector group
- respond to mouse down on the rotator handle to start 'rotate' mode - respond to mouse down on the rotator handle to start 'rotate' mode
@ -272,6 +273,7 @@ function SvgCanvas(c)
offset += 2; offset += 2;
} }
var bbox = cur_bbox || canvas.getBBox(this.selectedElement); var bbox = cur_bbox || canvas.getBBox(this.selectedElement);
// console.log({'cur_bbox':cur_bbox, 'bbox':bbox });
var l=bbox.x-offset, t=bbox.y-offset, w=bbox.width+(offset<<1), h=bbox.height+(offset<<1); var l=bbox.x-offset, t=bbox.y-offset, w=bbox.width+(offset<<1), h=bbox.height+(offset<<1);
// TODO: use suspendRedraw() here // TODO: use suspendRedraw() here
selectedBox.setAttribute("x", l); selectedBox.setAttribute("x", l);
@ -1354,7 +1356,6 @@ function SvgCanvas(c)
height=box.height, dx=(x-start_x), dy=(y-start_y); height=box.height, dx=(x-start_x), dy=(y-start_y);
// if rotated, adjust the dx,dy values // if rotated, adjust the dx,dy values
console.log(box);
var angle = canvas.getRotationAngle(selected); var angle = canvas.getRotationAngle(selected);
if (angle) { if (angle) {
var r = Math.sqrt( dx*dx + dy*dy ); var r = Math.sqrt( dx*dx + dy*dy );
@ -2429,6 +2430,21 @@ function SvgCanvas(c)
},0); },0);
var changes = {}; var changes = {};
changes[attr] = oldval; changes[attr] = oldval;
// if this element was rotated, and we changed the position of this element
// we need to update the rotational transform attribute and store it as part
// of our changeset
var angle = canvas.getRotationAngle(elem);
if (angle) {
var cx = selectedBBoxes[i].x + selectedBBoxes[i].width/2,
cy = selectedBBoxes[i].y + selectedBBoxes[i].height/2;
var rotate = ["rotate(", angle, " ", cx, ",", cy, ")"].join('');
if (rotate != elem.getAttribute("transform")) {
elem.setAttribute("transform", rotate);
changes['transform'] = rotate;
}
}
batchCmd.addSubCommand(new ChangeElementCommand(elem, changes, attr)); batchCmd.addSubCommand(new ChangeElementCommand(elem, changes, attr));
} }
} }