summaryrefslogtreecommitdiffstats
path: root/src/sp-item-group.cpp
diff options
context:
space:
mode:
authorJabiertxof <jtx@jtx>2016-12-16 12:00:49 +0000
committerJabiertxof <jtx@jtx>2016-12-16 12:00:49 +0000
commit4446366fd075fb801420da520848c774b8ac4254 (patch)
treec2fc74dabefc43fd586aaf51405bebc698d7ba94 /src/sp-item-group.cpp
parentFixing nested mirrors (diff)
parentFix bug where conical gradient drawn in wrong arc. (diff)
downloadinkscape-4446366fd075fb801420da520848c774b8ac4254.tar.gz
inkscape-4446366fd075fb801420da520848c774b8ac4254.zip
Update to trunk
(bzr r15295.1.23)
Diffstat (limited to 'src/sp-item-group.cpp')
-rw-r--r--src/sp-item-group.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 96dcdbe30..7b2507b5e 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -584,12 +584,13 @@ sp_item_group_ungroup (SPGroup *group, std::vector<SPItem*> &children, bool do_d
SPText * text = dynamic_cast<SPText *>(citem);
if (text) {
//this causes a change in text-on-path appearance when there is a non-conformal transform, see bug #1594565
- double scale = (ctrans.expansionX() + ctrans.expansionY()) / 2.0;
SPTextPath * text_path = dynamic_cast<SPTextPath *>(text->firstChild());
if (!text_path) {
nrepr->setAttribute("transform", affinestr);
} else {
- sp_recursive_scale_text_size(nrepr, scale);
+ // The following breaks roundtripping group -> ungroup
+ // double scale = (ctrans.expansionX() + ctrans.expansionY()) / 2.0;
+ // sp_recursive_scale_text_size(nrepr, scale);
Geom::Affine ttrans = ctrans.inverse() * SP_ITEM(text)->transform * ctrans;
gchar *affinestr = sp_svg_transform_write(ttrans);
nrepr->setAttribute("transform", affinestr);