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

Fix gradients broken from previous checkins 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@555 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-09-04 06:30:18 +00:00
parent c9c771392d
commit 701549a404
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
editor/svgcanvas.js
View File

@ -2386,6 +2386,8 @@ function BatchCommand(text) {
cur_properties.stroke_paint = {type:"solidColor"}; cur_properties.stroke_paint = {type:"solidColor"};
if (!preventUndo) if (!preventUndo)
this.changeSelectedAttribute("stroke", val); this.changeSelectedAttribute("stroke", val);
else
this.changeSelectedAttributeNoUndo("stroke", val);
}; };
this.getFillColor = function() { this.getFillColor = function() {
@ -2404,8 +2406,12 @@ function BatchCommand(text) {
elems.push(elem); elems.push(elem);
} }
} }
if (elems.length > 0 && !preventUndo) if (elems.length > 0) {
if (!preventUndo)
this.changeSelectedAttribute("fill", val, elems); this.changeSelectedAttribute("fill", val, elems);
else
this.changeSelectedAttributeNoUndo("fill", val, elems);
}
}; };
var findDefs = function() { var findDefs = function() {
@ -2488,6 +2494,10 @@ function BatchCommand(text) {
this.setStrokePaint = function(p, addGrad) { this.setStrokePaint = function(p, addGrad) {
// make a copy // make a copy
var p = new $.jGraduate.Paint(p); var p = new $.jGraduate.Paint(p);
this.setStrokeOpacity(p.alpha/100);
// now set the current paint object
cur_properties.stroke_paint = p;
if (p.type == "solidColor") { if (p.type == "solidColor") {
this.setStrokeColor("#"+p.solidColor); this.setStrokeColor("#"+p.solidColor);
} }
@ -2498,15 +2508,15 @@ function BatchCommand(text) {
else { else {
// console.log("none!"); // console.log("none!");
} }
this.setStrokeOpacity(p.alpha/100);
// now set the current paint object
cur_properties.stroke_paint = p;
}; };
this.setFillPaint = function(p, addGrad) { this.setFillPaint = function(p, addGrad) {
// make a copy // make a copy
var p = new $.jGraduate.Paint(p); var p = new $.jGraduate.Paint(p);
this.setFillOpacity(p.alpha/100, true);
// now set the current paint object
cur_properties.fill_paint = p;
if (p.type == "solidColor") { if (p.type == "solidColor") {
this.setFillColor("#"+p.solidColor); this.setFillColor("#"+p.solidColor);
} }
@ -2517,10 +2527,6 @@ function BatchCommand(text) {
else { else {
// console.log("none!"); // console.log("none!");
} }
this.setFillOpacity(p.alpha/100);
// now set the current paint object
cur_properties.fill_paint = p;
}; };
this.getStrokeWidth = function() { this.getStrokeWidth = function() {
@ -2561,6 +2567,8 @@ function BatchCommand(text) {
cur_shape.fill_opacity = val; cur_shape.fill_opacity = val;
if (!preventUndo) if (!preventUndo)
this.changeSelectedAttribute("fill-opacity", val); this.changeSelectedAttribute("fill-opacity", val);
else
this.changeSelectedAttributeNoUndo("fill-opacity", val);
}; };
this.getStrokeOpacity = function() { this.getStrokeOpacity = function() {
@ -2571,6 +2579,8 @@ function BatchCommand(text) {
cur_shape.stroke_opacity = val; cur_shape.stroke_opacity = val;
if (!preventUndo) if (!preventUndo)
this.changeSelectedAttribute("stroke-opacity", val); this.changeSelectedAttribute("stroke-opacity", val);
else
this.changeSelectedAttributeNoUndo("stroke-opacity", val);
}; };
this.getBBox = function(elem) { this.getBBox = function(elem) {
@ -2759,6 +2769,7 @@ function BatchCommand(text) {
// fires the 'changed' event // fires the 'changed' event
this.changeSelectedAttributeNoUndo = function(attr, newValue, elems) { this.changeSelectedAttributeNoUndo = function(attr, newValue, elems) {
var handle = svgroot.suspendRedraw(1000); var handle = svgroot.suspendRedraw(1000);
var elems = elems || selectedElements;
var i = elems.length; var i = elems.length;
while (i--) { while (i--) {
var elem = elems[i]; var elem = elems[i];