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

Fix Issue 460: Path points remember curvature (Firefox and Opera) 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1330 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2010-02-03 06:49:20 +00:00
parent 36f7da8ff1
commit fac9f84435
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/svgcanvas.js
View File

@ -4755,17 +4755,16 @@ function BatchCommand(text) {
var points;
var bb = current_path.getBBox();
var oldseg = current_path.pathSegList.getItem(next_index);
switch ( new_type ) {
case 6:
var diff_x = next_x - cur_x;
var diff_y = next_y - cur_y;
var ct1_x = cur_x + (diff_y/2);
var ct1_y = cur_y - (diff_x/2);
var ct2_x = next_x + (diff_y/2);
var ct2_y = next_y - (diff_x/2);
// get control points from straight line segment
var ct1_x = oldseg.c1_x || (cur_x + (diff_y/2));
var ct1_y = oldseg.c1_y || (cur_y - (diff_x/2));
var ct2_x = oldseg.c2_x || (next_x + (diff_y/2));
var ct2_y = oldseg.c2_y || (next_y - (diff_x/2));
points = [next_x,next_y, ct1_x,ct1_y, ct2_x,ct2_y];
break;
case 4:
@ -4775,7 +4774,18 @@ function BatchCommand(text) {
}
replacePathSeg(new_type, next_index, points);
// if we changed to a straight line, store the old control points
var newseg = current_path.pathSegList.getItem(next_index);
if (newseg.pathSegType == 4 && oldseg.pathSegType == 6) {
newseg.c1_x = oldseg.x1;
newseg.c1_y = oldseg.y1;
newseg.c2_x = oldseg.x2;
newseg.c2_y = oldseg.y2;
}
}
// TODO: codedread, I need to be reminded of why WebKit needs to re-set @d
// (this prevents SVG-edit from remembering the curvature of points)
// d attribute needs to be manually updated for Webkit
if(isWebkit && current_path) {
var fixed_d = pathActions.convertPath(current_path);