summaryrefslogtreecommitdiffstats
path: root/src/sp-text.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2016-03-30 17:26:19 +0000
committertavmjong-free <tavmjong@free.fr>2016-03-30 17:26:19 +0000
commita18efaedfcc01ec5bd1b9c60ca55b8be4445c5cb (patch)
treec00e91922f73997e61405afb28c893f51a31845e /src/sp-text.cpp
parentFix for bug #1395435 (Inkscape crashes on load CDR select sheet) and bug #144... (diff)
downloadinkscape-a18efaedfcc01ec5bd1b9c60ca55b8be4445c5cb.tar.gz
inkscape-a18efaedfcc01ec5bd1b9c60ca55b8be4445c5cb.zip
Partial fix for bug 156221 ('line-height' with non-pixel scaled drawing).
(bzr r14752)
Diffstat (limited to 'src/sp-text.cpp')
-rw-r--r--src/sp-text.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index da92ad8d4..6ae1c4fba 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -645,6 +645,13 @@ void SPText::_adjustFontsizeRecursive(SPItem *item, double ex, bool is_root)
style->font_size.computed *= ex;
style->letter_spacing.computed *= ex;
style->word_spacing.computed *= ex;
+ if (style->line_height.unit != SP_CSS_UNIT_NONE &&
+ style->line_height.unit != SP_CSS_UNIT_PERCENT &&
+ style->line_height.unit != SP_CSS_UNIT_EM &&
+ style->line_height.unit != SP_CSS_UNIT_EX) {
+ // No unit on 'line-height' property has special behavior.
+ style->line_height.computed *= ex;
+ }
item->updateRepr();
}