diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-08-24 19:48:18 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-08-24 19:48:18 +0000 |
| commit | 0094efd3c64b8a7ab96135c697a0ac265069a78f (patch) | |
| tree | 564dc028eff4f5a7758ad762203e85f34f8e830d /src/sp-item-group.cpp | |
| parent | update to trunk (diff) | |
| parent | Revert custom gdl patch (focus indicator of docked dialogs) for Quartz backen... (diff) | |
| download | inkscape-0094efd3c64b8a7ab96135c697a0ac265069a78f.tar.gz inkscape-0094efd3c64b8a7ab96135c697a0ac265069a78f.zip | |
update to trunk
(bzr r13879.1.22)
Diffstat (limited to 'src/sp-item-group.cpp')
| -rw-r--r-- | src/sp-item-group.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index 72cd5d7fa..5d96899b1 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -465,7 +465,7 @@ sp_item_group_ungroup (SPGroup *group, std::vector<SPItem*> &children, bool do_d Inkscape::XML::Node *nrepr = child->getRepr()->duplicate(prepr->document()); // Merging transform - Geom::Affine ctrans; + Geom::Affine ctrans = citem->transform * g; // We should not apply the group's transformation to both a linked offset AND to its source if (dynamic_cast<SPOffset *>(citem)) { // Do we have an offset at hand (whether it's dynamic or linked)? SPItem *source = sp_offset_get_source(dynamic_cast<SPOffset *>(citem)); @@ -476,13 +476,9 @@ sp_item_group_ungroup (SPGroup *group, std::vector<SPItem*> &children, bool do_d source = sp_offset_get_source(dynamic_cast<SPOffset *>(source)); } if (source != NULL && // If true then we must be dealing with a linked offset ... - group->isAncestorOf(source) == false) { // ... of which the source is not in the same group - ctrans = citem->transform * g; // then we should apply the transformation of the group to the offset - } else { - ctrans = citem->transform; + group->isAncestorOf(source) ) { // ... of which the source is in the same group + ctrans = citem->transform; // then we should apply the transformation of the group to the offset } - } else { - ctrans = citem->transform * g; } // FIXME: constructing a transform that would fully preserve the appearance of a |