summaryrefslogtreecommitdiffstats
path: root/src/sp-text.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-05-08 07:40:39 +0000
committerjabiertxof <info@marker.es>2016-05-08 07:40:39 +0000
commitd9c43e3d6f19a2f1102743b61d999b477bba4b9a (patch)
treee77ac36155e0813318be3b9e7641338d86dac733 /src/sp-text.cpp
parentFixing page transforms (diff)
parentfix-bug-734201. stroke-to-path doesn't scale stroke width used in markers (diff)
downloadinkscape-d9c43e3d6f19a2f1102743b61d999b477bba4b9a.tar.gz
inkscape-d9c43e3d6f19a2f1102743b61d999b477bba4b9a.zip
update to trunk
(bzr r13682.1.40)
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();
}