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

Fixed Issue 385: Bounding box of a group of rotated paths is incorrect (trunk) 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1164 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-01-07 17:24:04 +00:00
parent 61c13f3cd2
commit bb0d190b4a
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/svgcanvas.js
View File

@ -418,7 +418,7 @@ function BatchCommand(text) {
offset += 2/canvas.getZoom(); offset += 2/canvas.getZoom();
} }
var bbox = canvas.getBBox(selected); var bbox = canvas.getBBox(selected);
if(!isWebkit && selected.tagName == 'g') { if(selected.tagName == 'g') {
// The bbox for a group does not include stroke vals, so we // The bbox for a group does not include stroke vals, so we
// get the bbox based on its children. // get the bbox based on its children.
var stroked_bbox = canvas.getStrokedBBox(selected.childNodes); var stroked_bbox = canvas.getStrokedBBox(selected.childNodes);
@ -5604,11 +5604,16 @@ function BatchCommand(text) {
// Opera is included here because Opera/Win/Non-EN seems to change // Opera is included here because Opera/Win/Non-EN seems to change
// transformlist float vals to use a comma rather than a period. // transformlist float vals to use a comma rather than a period.
if (isWebkit || !support.goodDecimals) { if (isWebkit || !support.goodDecimals) {
var t = svgTransformLists[elem.id]; var id = elem.id;
if (!t) { if(!id) {
svgTransformLists[elem.id] = new SVGEditTransformList(elem); // Get unique ID for temporary element
svgTransformLists[elem.id]._init(); id = 'temp';
t = svgTransformLists[elem.id]; }
var t = svgTransformLists[id];
if (!t || id == 'temp') {
svgTransformLists[id] = new SVGEditTransformList(elem);
svgTransformLists[id]._init();
t = svgTransformLists[id];
} }
return t; return t;
} }
@ -6249,7 +6254,6 @@ function BatchCommand(text) {
this.getStrokedBBox = function(elems) { this.getStrokedBBox = function(elems) {
if(!elems) elems = canvas.getVisibleElements(); if(!elems) elems = canvas.getVisibleElements();
if(!elems.length) return false; if(!elems.length) return false;
// Make sure the expected BBox is returned if the element is a group // Make sure the expected BBox is returned if the element is a group
// FIXME: doesn't this mean that every time we call getStrokedBBox() that we are // FIXME: doesn't this mean that every time we call getStrokedBBox() that we are
// re-creating the getCheckedBBox() function? shouldn't we make this a function // re-creating the getCheckedBBox() function? shouldn't we make this a function
@ -6355,21 +6359,21 @@ function BatchCommand(text) {
} }
return offset; return offset;
} }
var bboxes = [];
$.each(elems, function(i, elem) { $.each(elems, function(i, elem) {
var cur_bb = getCheckedBBox(elem); var cur_bb = getCheckedBBox(elem);
if(!cur_bb) return; if(!cur_bb) return;
var offset = getOffset(elem); var offset = getOffset(elem);
min_x = Math.min(min_x, cur_bb.x - offset); min_x = Math.min(min_x, cur_bb.x - offset);
min_y = Math.min(min_y, cur_bb.y - offset); min_y = Math.min(min_y, cur_bb.y - offset);
bboxes.push(cur_bb);
}); });
full_bb.x = min_x; full_bb.x = min_x;
full_bb.y = min_y; full_bb.y = min_y;
$.each(elems, function(i, elem) { $.each(elems, function(i, elem) {
var cur_bb = getCheckedBBox(elem); var cur_bb = bboxes[i];
if(!cur_bb) return;
var offset = getOffset(elem); var offset = getOffset(elem);
max_x = Math.max(max_x, cur_bb.x + cur_bb.width + offset); max_x = Math.max(max_x, cur_bb.x + cur_bb.width + offset);
max_y = Math.max(max_y, cur_bb.y + cur_bb.height + offset); max_y = Math.max(max_y, cur_bb.y + cur_bb.height + offset);