diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-02-19 20:53:49 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-02-19 20:53:49 +0000 |
| commit | 00fc90aa611e0f0416be239e92260523dbba9bfb (patch) | |
| tree | eeefb0ae24533e738193ae7999a94e8cf8ad30cc /src | |
| parent | Basic filleting using pointwise (diff) | |
| parent | scale groups when changing document units. (Bug 1369197) (diff) | |
| download | inkscape-00fc90aa611e0f0416be239e92260523dbba9bfb.tar.gz inkscape-00fc90aa611e0f0416be239e92260523dbba9bfb.zip | |
update to trunk
(bzr r13645.1.17)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-item-group.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index 35840e01a..3c2053cb2 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -727,21 +727,16 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p, bo subItem = dynamic_cast<SPItem *>(item->clip_ref->getObject()->firstChild()); } if (subItem != NULL) { - Geom::Affine tdoc2dt = Geom::Scale(1, -1) * Geom::Translate(p); // re-create doc2dt() - Geom::Affine ti2doc = item->i2doc_affine(); - subItem->set_i2d_affine(ti2doc * sc * ti2doc.inverse() * tdoc2dt); - subItem->doWriteTransform(subItem->getRepr(), subItem->transform, NULL, true); + subItem->doWriteTransform(subItem->getRepr(), subItem->transform*sc, NULL, true); } subItem = NULL; if (item->mask_ref->getObject()) { subItem = dynamic_cast<SPItem *>(item->mask_ref->getObject()->firstChild()); } if (subItem != NULL) { - Geom::Affine tdoc2dt = Geom::Scale(1, -1) * Geom::Translate(p); // re-create doc2dt() - Geom::Affine ti2doc = item->i2doc_affine(); - subItem->set_i2d_affine(ti2doc * sc * ti2doc.inverse() * tdoc2dt); - subItem->doWriteTransform(item->getRepr(), item->transform, NULL, true); + subItem->doWriteTransform(subItem->getRepr(), subItem->transform*sc, NULL, true); } + item->doWriteTransform(item->getRepr(), sc.inverse()*item->transform*sc, NULL, true); group->scaleChildItemsRec(sc, p, false); } } else { @@ -795,8 +790,7 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p, bo Geom::Affine move = final.inverse() * item->transform * final; item->doWriteTransform(item->getRepr(), move, &move, true); } else { - item->set_i2d_affine(item->i2dt_affine() * final); - item->doWriteTransform(item->getRepr(), item->transform, NULL, true); + item->doWriteTransform(item->getRepr(), item->transform*sc, NULL, true); } if (conn_type != NULL) { |