From 5a66cd4f9f61e68589e1dd7556571dbe0cbd16d1 Mon Sep 17 00:00:00 2001 From: Alexis Deveria Date: Mon, 12 Jul 2010 20:19:43 +0000 Subject: [PATCH] Made various minor improvements to ext-shapes.js, fixed several issues related to issues 593 and 595, including better handling of imported images with 100% width/height git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1628 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/extensions/ext-shapes.js | 13 +++--- editor/svg-editor.js | 12 ++++- editor/svgcanvas.js | 77 +++++++++++++++++++++++++++++---- 3 files changed, 86 insertions(+), 16 deletions(-) diff --git a/editor/extensions/ext-shapes.js b/editor/extensions/ext-shapes.js index 1c15340a..00cc1318 100644 --- a/editor/extensions/ext-shapes.js +++ b/editor/extensions/ext-shapes.js @@ -142,7 +142,7 @@ svgEditor.addExtension("shapes", function() { buttons: [{ id: "tool_shapelib", type: "mode_flyout", // _flyout - position: 5, + position: 6, title: "Shape library", events: { "click": function() { @@ -326,7 +326,9 @@ svgEditor.addExtension("shapes", function() { sy = sy || 1; // Not perfect, but mostly works... - if(x < start_x) tx = lastBBox.width; + if(x < start_x) { + tx = lastBBox.width; + } if(y < start_y) ty = lastBBox.height; // update the transform list with translate,scale,translate @@ -336,9 +338,10 @@ svgEditor.addExtension("shapes", function() { translateOrigin.setTranslate(-(left+tx), -(top+ty)); if(!evt.shiftKey) { - var max = Math.max(sx, sy); - sx = max; - sy = max; + var max = Math.min(Math.abs(sx), Math.abs(sy)); + + sx = max * (sx < 0 ? -1 : 1); + sy = max * (sy < 0 ? -1 : 1); } scale.setScale(sx,sy); diff --git a/editor/svg-editor.js b/editor/svg-editor.js index 86c4a3b6..ef0ea2eb 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -3596,8 +3596,16 @@ } if(center) { - w_area[0].scrollLeft = scroll_x; - w_area[0].scrollTop = scroll_y; + // Go to top-left for larger documents + if(svgCanvas.contentW > w_area.width()) { + // Top-left + workarea[0].scrollLeft = offset.x - 10; + workarea[0].scrollTop = offset.y - 10; + } else { + // Center + w_area[0].scrollLeft = scroll_x; + w_area[0].scrollTop = scroll_y; + } } else { w_area[0].scrollLeft = new_ctr.x - w_orig/2; w_area[0].scrollTop = new_ctr.y - h_orig/2; diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js index 957c231e..759d2756 100644 --- a/editor/svgcanvas.js +++ b/editor/svgcanvas.js @@ -3049,6 +3049,28 @@ var remapElement = this.remapElement = function(selected,changes,m) { }; +// Function: updateClipPath +// Updates a s values based on the given translation of an element +// +// Parameters: +// attr - The clip-path attribute value with the clipPath's ID +// tx - The translation's x value +// ty - The translation's y value +var updateClipPath = function(attr, tx, ty) { + var id = getUrlFromAttr(attr).substr(1); + var path = getElem(id).firstChild; + + var cp_xform = getTransformList(path); + + var newxlate = svgroot.createSVGTransform(); + newxlate.setTranslate(tx, ty); + + cp_xform.appendItem(newxlate); + + // Update clipPath's dimensions + recalculateDimensions(path); +} + // Function: recalculateDimensions // Decides the course of action based on the element's transform list // @@ -3320,9 +3342,23 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) { // we pass the translates down to the individual children var children = selected.childNodes; var c = children.length; + + var clipPaths_done = []; + while (c--) { var child = children.item(c); if (child.nodeType == 1) { + + // Check if child has clip-path + if(child.getAttribute('clip-path')) { + // tx, ty + var attr = child.getAttribute('clip-path'); + if($.inArray(attr, clipPaths_done) === -1) { + updateClipPath(attr, tx, ty); + clipPaths_done.push(attr); + } + } + var old_start_transform = start_transform; start_transform = child.getAttribute("transform"); @@ -3352,6 +3388,9 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) { } } } + + clipPaths_done = []; + start_transform = old_start_transform; } } @@ -3449,17 +3488,26 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) { } // else, it's a non-group else { + // FIXME: box might be null for some elements ( etc), need to handle this var box = getBBox(selected); - if(!box) return null; + + // Paths (and possbly other shapes) will have no BBox while still in , + // but we still may need to recalculate them (see issue 595). + // TODO: Figure out how to get BBox from these elements in case they + // have a rotation transform - var oldcenter = {x: box.x+box.width/2, y: box.y+box.height/2}, - newcenter = transformPoint(box.x+box.width/2, box.y+box.height/2, - transformListToTransform(tlist).matrix), - m = svgroot.createSVGMatrix(), + if(!box && selected.tagName != 'path') return null; + + + var m = svgroot.createSVGMatrix(), // temporarily strip off the rotate and save the old center angle = getRotationAngle(selected); if (angle) { + var oldcenter = {x: box.x+box.width/2, y: box.y+box.height/2}, + newcenter = transformPoint(box.x+box.width/2, box.y+box.height/2, + transformListToTransform(tlist).matrix); + var a = angle * Math.PI / 180; if ( Math.abs(a) > (1.0e-10) ) { var s = Math.sin(a)/(1 - Math.cos(a)); @@ -3608,7 +3656,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) { // we want it to be [Rnew][M][Tr] where Tr is the // translation required to re-center it // Therefore, [Tr] = [M_inv][Rnew_inv][Rold][M] - else if (operation == 3) { + else if (operation == 3 && angle) { var m = transformListToTransform(tlist).matrix; var roldt = svgroot.createSVGTransform(); roldt.setRotate(angle, oldcenter.x, oldcenter.y); @@ -7705,6 +7753,8 @@ this.setSvgString = function(xmlString) { overflow: curConfig.show_outside_canvas?'visible':'hidden' }; + var percs = false; + // determine proper size if (content.attr("viewBox")) { var vb = content.attr("viewBox").split(' '); @@ -7715,17 +7765,26 @@ this.setSvgString = function(xmlString) { else { $.each(['width', 'height'], function(i, dim) { // Set to 100 if not given - var val = content.attr(dim) || 100; - + var val = content.attr(dim); + + if(!val) val = '100%'; + if((val+'').substr(-1) === "%") { // Use user units if percentage given - attrs[dim] = parseInt(val); + percs = true; } else { attrs[dim] = convertToNum(dim, val); } }); } + // Percentage width/height, so let's base it on visible elements + if(percs) { + var bb = getStrokedBBox(); + attrs.width = bb.width; + attrs.height = bb.height; + } + content.attr(attrs); this.contentW = attrs['width']; this.contentH = attrs['height'];