summaryrefslogtreecommitdiffstats
path: root/src/sp-item-group.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-08-17 14:46:20 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-08-17 14:46:20 +0000
commita4c8b296b04ffcb728e75f465872cfd42aef787e (patch)
tree139168352b7852adff3237e9323246e0603ff81d /src/sp-item-group.cpp
parentFix gtk3 build (diff)
parentSimilar workaround to r13523 (text&font dialog not appearing quickly) (diff)
downloadinkscape-a4c8b296b04ffcb728e75f465872cfd42aef787e.tar.gz
inkscape-a4c8b296b04ffcb728e75f465872cfd42aef787e.zip
Update to trunk r13525
(bzr r13341.1.142)
Diffstat (limited to 'src/sp-item-group.cpp')
-rw-r--r--src/sp-item-group.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 657aca692..bb52b0c55 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -660,12 +660,6 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p)
Geom::Translate const s(p);
Geom::Affine final = s.inverse() * sc * s;
- Geom::Point old_center(0,0);
- if (item->isCenterSet()) {
- item->scaleCenter(sc.inverse()); // Convert the old relative center position to the new coordinates already now
- old_center = item->getCenter(); // because getCenter() will use the bbox midpoint, which is also already in the new coordinates
- }
-
gchar const *conn_type = NULL;
if (SP_IS_TEXT_TEXTPATH(item)) {
SP_TEXT(item)->optimizeTextpathText();
@@ -710,7 +704,7 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p)
}
if (item->isCenterSet() && !(final.isTranslation() || final.isIdentity())) {
- item->setCenter(old_center * final);
+ item->scaleCenter(sc); // All coordinates have been scaled, so also the center must be scaled
item->updateRepr();
}
}