summaryrefslogtreecommitdiffstats
path: root/src/text-chemistry.cpp
diff options
context:
space:
mode:
authorbulia byak <buliabyak@gmail.com>2009-02-24 00:01:20 +0000
committerbuliabyak <buliabyak@users.sourceforge.net>2009-02-24 00:01:20 +0000
commitc6e03fe1ea753b4edac9885de8ff7e6104110dd8 (patch)
treebb2eae779b5c05bad8695db2464ef84a8dbe4a45 /src/text-chemistry.cpp
parentfix crash when displaying dash selector (diff)
downloadinkscape-c6e03fe1ea753b4edac9885de8ff7e6104110dd8.tar.gz
inkscape-c6e03fe1ea753b4edac9885de8ff7e6104110dd8.zip
fix font size jump when unflowing flowed text
(bzr r7357)
Diffstat (limited to 'src/text-chemistry.cpp')
-rw-r--r--src/text-chemistry.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index f1348ad67..f574b69fb 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -417,6 +417,10 @@ text_unflow ()
SPItem *flowtext = SP_ITEM(items->data);
+ // we discard transform when unflowing, but we must preserve expansion which is visible as
+ // font size multiplier
+ double ex = (flowtext->transform).descrim();
+
if (sp_te_get_string_multiline(flowtext) == NULL) { // flowtext is empty
continue;
}
@@ -449,6 +453,9 @@ text_unflow ()
SP_OBJECT_REPR(SP_OBJECT_PARENT(flowtext))->appendChild(rtext);
SPObject *text_object = doc->getObjectByRepr(rtext);
+ // restore the font size multiplier from the flowtext's transform
+ SP_TEXT(text_object)->_adjustFontsizeRecursive(SP_ITEM(text_object), ex);
+
new_objs = g_slist_prepend (new_objs, text_object);
old_objs = g_slist_prepend (old_objs, flowtext);