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

Fix several bugs with gradient picking. Uplift to latest jGraduate.

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@348 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Jeff Schiller
2009-08-01 05:03:51 +00:00
parent 70c9361e1c
commit d1d91c556e
3 changed files with 172 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
editor/svgcanvas.js
View File

@@ -415,7 +415,7 @@ function SvgCanvas(c)
var current_mode = "select";
var current_resize_mode = "none";
var current_fill = "none";
var current_stroke = "black";
var current_stroke = "#000000";
var current_stroke_paint = null;
var current_fill_paint = null;
var current_stroke_width = 1;
@@ -1540,16 +1540,14 @@ function SvgCanvas(c)
return null;
};
// TODO: what to do about the opacity in these functions?
this.setStrokePaint = function(p) {
current_stroke_paint = p;
if (p.solidColor) {
this.setStrokeColor("#"+p.solidColor.hex);
current_stroke_paint = new $.jGraduate.Paint(p);
if (current_stroke_paint.type == "solidColor") {
this.setStrokeColor("#"+current_stroke_paint.solidColor);
}
else if(p.linearGradient.grad) {
else if(current_stroke_paint.type == "linearGradient") {
// find out if there is a duplicate gradient already in the defs
var grad = p.linearGradient.grad;
var grad = current_stroke_paint.linearGradient;
var duplicate_grad = findDuplicateGradient(grad);
var defs = findDefs();
@@ -1569,16 +1567,22 @@ function SvgCanvas(c)
else {
// console.log("none!");
}
this.setStrokeOpacity(current_stroke_paint.alpha/100);
};
// TODO: rework this so that we are not append elements into the SVG at this stage
// This should only be done at the actual creation stage or when we change a selected
// element's fill paint - at that point, batch up the creation of the gradient element
// with the creation/change
this.setFillPaint = function(p) {
current_fill_paint = p;
if (p.solidColor) {
this.setFillColor("#"+p.solidColor.hex);
// copy the incoming paint object
current_fill_paint = new $.jGraduate.Paint(p);
if (current_fill_paint.type == "solidColor") {
this.setFillColor("#"+current_fill_paint.solidColor);
}
else if(p.linearGradient.grad) {
else if(current_fill_paint.type == "linearGradient") {
// find out if there is a duplicate gradient already in the defs
var grad = p.linearGradient.grad;
var grad = current_fill_paint.linearGradient;
var duplicate_grad = findDuplicateGradient(grad);
var defs = findDefs();
@@ -1598,6 +1602,7 @@ function SvgCanvas(c)
else {
// console.log("none!");
}
this.setFillOpacity(current_fill_paint.alpha/100);
};
this.getStrokeWidth = function() {