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

Improved paint box setting for selected groups

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1891 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2010-12-20 21:37:04 +00:00
parent 96d52da577
commit 2c7f131050
2 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
editor/svg-editor.js
View File

@@ -1338,15 +1338,23 @@
// updates the toolbar (colors, opacity, etc) based on the selected element // updates the toolbar (colors, opacity, etc) based on the selected element
// This function also updates the opacity and id elements that are in the context panel // This function also updates the opacity and id elements that are in the context panel
var updateToolbar = function() { var updateToolbar = function() {
if (selectedElement != null && ['use', 'image', 'foreignObject', 'g', 'a'].indexOf(selectedElement.tagName) === -1) { if (selectedElement != null) {
var all_swidth = null; var all_swidth = null;
// if(selectedElement.tagName === "g" || selectedElement.tagName === "a") { switch ( selectedElement.tagName ) {
// // Look for common styles case 'use':
case 'image':
case 'foreignObject':
break;
case 'g':
case 'a':
// Look for common styles
// var gFill = null;
//
// var childs = selectedElement.getElementsByTagName('*'); // var childs = selectedElement.getElementsByTagName('*');
// console.log('ch', childs);
// for(var i = 0, len = childs.length; i < len; i++) { // for(var i = 0, len = childs.length; i < len; i++) {
// var elem = childs[i];
// var swidth = elem.getAttribute("stroke-width"); // var swidth = elem.getAttribute("stroke-width");
// if(swidth && swidth !== all_swidth) { // if(swidth && swidth !== all_swidth) {
// // different, so do don't check more // // different, so do don't check more
@@ -1357,23 +1365,30 @@
// all_swidth = swidth; // all_swidth = swidth;
// } // }
// } // }
// } //
paintBox.fill.update(true);
paintBox.fill.update(true); paintBox.stroke.update(true);
paintBox.stroke.update(true);
$('#stroke_width').val(all_swidth || selectedElement.getAttribute("stroke-width") || 1);
$('#stroke_style').val(selectedElement.getAttribute("stroke-dasharray")||"none");
var attr = selectedElement.getAttribute("stroke-linejoin") || 'miter';
break;
if ($('#linejoin_' + attr).length != 0) default:
setStrokeOpt($('#linejoin_' + attr)[0]); paintBox.fill.update(true);
paintBox.stroke.update(true);
attr = selectedElement.getAttribute("stroke-linecap") || 'butt';
$('#stroke_width').val(all_swidth || selectedElement.getAttribute("stroke-width") || 1);
if ($('#linecap_' + attr).length != 0) $('#stroke_style').val(selectedElement.getAttribute("stroke-dasharray")||"none");
setStrokeOpt($('#linecap_' + attr)[0]);
var attr = selectedElement.getAttribute("stroke-linejoin") || 'miter';
if ($('#linejoin_' + attr).length != 0)
setStrokeOpt($('#linejoin_' + attr)[0]);
attr = selectedElement.getAttribute("stroke-linecap") || 'butt';
if ($('#linecap_' + attr).length != 0)
setStrokeOpt($('#linecap_' + attr)[0]);
}
} }
// All elements including image and group have opacity // All elements including image and group have opacity
@@ -3369,20 +3384,44 @@
this.update = function(apply) { this.update = function(apply) {
if(!selectedElement) return; if(!selectedElement) return;
var type = this.type; var type = this.type;
var paintOpacity = parseFloat(selectedElement.getAttribute(type + "-opacity"));
if (isNaN(paintOpacity)) { if(selectedElement.tagName === 'g') {
paintOpacity = 1.0; var gPaint = null;
var childs = selectedElement.getElementsByTagName('*');
for(var i = 0, len = childs.length; i < len; i++) {
var elem = childs[i];
var p = elem.getAttribute(type);
if(i === 0) {
gPaint = p;
} else if(gPaint !== p) {
gPaint = null;
}
}
if(gPaint === null) {
// No common color, don't update anything
return;
}
var paintColor = gPaint;
var paintOpacity = 1;
} else {
var paintOpacity = parseFloat(selectedElement.getAttribute(type + "-opacity"));
if (isNaN(paintOpacity)) {
paintOpacity = 1.0;
}
var defColor = type === "fill" ? "black" : "none";
var paintColor = selectedElement.getAttribute(type) || defColor;
} }
var defColor = type === "fill" ? "black" : "none";
var paintColor = selectedElement.getAttribute(type) || defColor;
if(apply) { if(apply) {
svgCanvas.setColor(type, paintColor, true); svgCanvas.setColor(type, paintColor, true);
svgCanvas.setPaintOpacity(type, paintOpacity, true); svgCanvas.setPaintOpacity(type, paintOpacity, true);
} }
paintOpacity *= 100; paintOpacity *= 100;
var paint = getPaint(paintColor, paintOpacity, type); var paint = getPaint(paintColor, paintOpacity, type);
// update the rect inside #fill_color/#stroke_color // update the rect inside #fill_color/#stroke_color

1
editor/svgcanvas.js
View File

@@ -1225,6 +1225,7 @@ var remapElement = this.remapElement = function(selected,changes,m) {
findDefs().appendChild(newgrad); findDefs().appendChild(newgrad);
selected.setAttribute(type, 'url(#' + newgrad.id + ')'); selected.setAttribute(type, 'url(#' + newgrad.id + ')');
} }
} }
} }