summaryrefslogtreecommitdiffstats
path: root/src/desktop-style.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-09-25 09:35:59 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-09-25 09:35:59 +0000
commitea10837f7a960bb9b914df1f25798c0b3e1da60f (patch)
tree18cf55bd22a8104c8578f1fcb1f966390599e043 /src/desktop-style.cpp
parentosx-build.sh: sync with osxmenu (whitespace, formatting) (diff)
parentFix for #1334792. Correct inheritance for 'line-height' property. (diff)
downloadinkscape-ea10837f7a960bb9b914df1f25798c0b3e1da60f.tar.gz
inkscape-ea10837f7a960bb9b914df1f25798c0b3e1da60f.zip
update to trunk (r13564)
(bzr r13506.1.107)
Diffstat (limited to 'src/desktop-style.cpp')
-rw-r--r--src/desktop-style.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index f6347e5c0..bfd662c9a 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -1011,8 +1011,8 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res)
} else if (style->line_height.unit == SP_CSS_UNIT_PERCENT || style->font_size.computed == 0) {
linespacing_current = style->line_height.value;
linespacing_normal = false;
- } else { // we need % here
- linespacing_current = style->line_height.computed / style->font_size.computed;
+ } else {
+ linespacing_current = style->line_height.computed;
linespacing_normal = false;
}
linespacing += linespacing_current;