canvas color is updated when loading a file

master
Mark MacKay 2012-07-13 19:14:24 -05:00
parent fc9f90c07c
commit 4432847200
2 changed files with 444 additions and 436 deletions

View File

@ -1412,6 +1412,10 @@
// create a new layer background if it doesn't exist
if (!document.getElementById('canvas_background')) createBackground();
else {
var fill = document.getElementById('canvas_background').getAttribute("fill");
}
if($.pref('bkgd_color')) {
setBackground($.pref('bkgd_color'), $.pref('bkgd_url'));
} else if($.pref('bkgd_url')) {
@ -3491,6 +3495,10 @@
};
var PaintBox = function(container, type) {
var background = document.getElementById("canvas_background");
if (this.type == "stroke") var cur = curConfig['initStroke'];
if (this.type == "fill") var cur = curConfig['initFill'];
if (this.type == "canvas") var cur = (background) ? background.getAttribute("fill") : "#fff";
var cur = curConfig[type === 'stroke' ? 'initStroke' : 'initFill'];
// set up gradients to be used for the buttons
@ -3536,7 +3544,6 @@
svgCanvas.setPaintOpacity(this.type, opac, true);
}
if (this.type == "canvas") {
var background = document.getElementById("canvas_background");
if (background) background.setAttribute('fill', fillAttr)
else createBackground(fillAttr)
}

File diff suppressed because it is too large Load Diff