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

Fix absolute path when resizing. Remove suspendRedraw for path (only making one DOM call)

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@386 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Jeff Schiller
2009-08-15 10:53:56 +00:00
parent 16f7caa078
commit a69ea2ed1d
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/svg-editor.html
View File

@@ -33,7 +33,7 @@
<div id="logo"> <div id="logo">
<a href="http://svg-edit.googlecode.com/" target="_blank" title="SVG-edit Home Page"> <a href="http://svg-edit.googlecode.com/" target="_blank" title="SVG-edit Home Page">
<img src="images/logo.png" width="32" height="32"></img> <img src="images/logo.png" width="32" height="32"/>
</a> </a>
</div> </div>

22
editor/svgcanvas.js
View File

@@ -759,7 +759,6 @@ function SvgCanvas(c)
case "path": case "path":
// extract the x,y from the path, adjust it and write back the new path // extract the x,y from the path, adjust it and write back the new path
// but first, save the old path // but first, save the old path
var handle = svgroot.suspendRedraw(1000);
changes["d"] = selected.getAttribute("d"); changes["d"] = selected.getAttribute("d");
var M = selected.pathSegList.getItem(0); var M = selected.pathSegList.getItem(0);
var curx = M.x, cury = M.y; var curx = M.x, cury = M.y;
@@ -796,59 +795,48 @@ function SvgCanvas(c)
case 13: // relative horizontal line (h) case 13: // relative horizontal line (h)
case 15: // relative vertical line (v) case 15: // relative vertical line (v)
case 19: // relative smooth quad (t) case 19: // relative smooth quad (t)
x = scalew(x);
y = scaleh(y);
curx += x; curx += x;
cury += y; cury += y;
newd += [" ", pathMap[type], x, ",", y].join(''); newd += [" ", pathMap[type], scalew(x), ",", scaleh(y)].join('');
break; break;
case 6: // absolute cubic (C) case 6: // absolute cubic (C)
x -= curx; x1 -= curx; x2 -= curx; x -= curx; x1 -= curx; x2 -= curx;
y -= cury; y1 -= cury; y2 -= cury; y -= cury; y1 -= cury; y2 -= cury;
case 7: // relative cubic (c) case 7: // relative cubic (c)
x = scalew(x);
y = scaleh(y);
curx += x; curx += x;
cury += y; cury += y;
newd += [" c", scalew(x1), ",", scaleh(y1), " ", scalew(x2), ",", scaleh(y2), newd += [" c", scalew(x1), ",", scaleh(y1), " ", scalew(x2), ",", scaleh(y2),
" ", x, ",", y].join(''); " ", scalew(x), ",", scaleh(y)].join('');
break; break;
case 8: // absolute quad (Q) case 8: // absolute quad (Q)
x -= curx; x1 -= curx; x -= curx; x1 -= curx;
y -= cury; y1 -= cury; y -= cury; y1 -= cury;
case 9: // relative quad (q) case 9: // relative quad (q)
x = scalew(x);
y = scaleh(y);
curx += x; curx += x;
cury += y; cury += y;
newd += [" q", scalew(x1), ",", scaleh(y1), " ", x, ",", y].join(''); newd += [" q", scalew(x1), ",", scaleh(y1), " ", scalew(x), ",", scaleh(y)].join('');
break; break;
case 10: // absolute elliptical arc (A) case 10: // absolute elliptical arc (A)
x -= curx; x -= curx;
y -= cury; y -= cury;
case 11: // relative elliptical arc (a) case 11: // relative elliptical arc (a)
x = scalew(x);
y = scaleh(y);
curx += x; curx += x;
cury += y; cury += y;
newd += [ "a", scalew(seg.r1), ",", scaleh(seg.r2), " ", seg.angle, " ", newd += [ "a", scalew(seg.r1), ",", scaleh(seg.r2), " ", seg.angle, " ",
(seg.largeArcFlag ? 1 : 0), " ", (seg.sweepFlag ? 1 : 0), " ", (seg.largeArcFlag ? 1 : 0), " ", (seg.sweepFlag ? 1 : 0), " ",
x, ",", y ].join('') scalew(x), ",", scaleh(y) ].join('')
break; break;
case 16: // absolute smooth cubic (S) case 16: // absolute smooth cubic (S)
x -= curx; x2 -= curx; x -= curx; x2 -= curx;
y -= cury; y2 -= cury; y -= cury; y2 -= cury;
case 17: // relative smooth cubic (s) case 17: // relative smooth cubic (s)
x = scalew(x);
y = scaleh(y);
curx += x; curx += x;
cury += y; cury += y;
newd += [" s", scalew(x2), ",", scaleh(y2), " ", x, ",", y].join(''); newd += [" s", scalew(x2), ",", scaleh(y2), " ", scalew(x), ",", scaleh(y)].join('');
break; break;
} // switch on path segment type } // switch on path segment type
} // for each segment } // for each segment
selected.setAttributeNS(null, "d", newd); selected.setAttributeNS(null, "d", newd);
svgroot.unsuspendRedraw(handle);
break; break;
case "line": case "line":
changes["x1"] = selected.x1.baseVal.value; changes["x1"] = selected.x1.baseVal.value;