From: buliabyak <buliabyak@users.sourceforge.net>
Date: Tue, 24 Feb 2009 00:01:20 +0000 (+0000)
Subject: fix font size jump when unflowing flowed text
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=34876292de123a2027995e7e3cea2dcf1472a544;p=inkscape.git

fix font size jump when unflowing flowed text
---

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);