diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2016-03-22 14:26:07 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2016-03-22 14:26:07 +0000 |
| commit | 6fa580b554e03eb7e53593d10a2e97c5975ee3f8 (patch) | |
| tree | 307f2b770ef3311e34459c846c5ad20a79e6f028 /src/style.cpp | |
| parent | inkex.py code simplification (more compact if conditions, unreachable code) (diff) | |
| parent | Add line-height unit selector to text toolbar. (diff) | |
| download | inkscape-6fa580b554e03eb7e53593d10a2e97c5975ee3f8.tar.gz inkscape-6fa580b554e03eb7e53593d10a2e97c5975ee3f8.zip | |
More complete handling of units for 'line-height' in text toolbar.
(bzr r14735)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/style.cpp b/src/style.cpp index 99beaed22..1f98a50a3 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -113,7 +113,7 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : font_weight( "font-weight", enum_font_weight, SP_CSS_FONT_WEIGHT_NORMAL, SP_CSS_FONT_WEIGHT_400 ), font_stretch( "font-stretch", enum_font_stretch, SP_CSS_FONT_STRETCH_NORMAL ), font_size(), - line_height( "line-height", 125 ), // SPILengthOrNormal + line_height( "line-height", 1.25 ), // SPILengthOrNormal font_family( "font-family", "sans-serif" ), // SPIString w/default font(), // SPIFont font_specification( "-inkscape-font-specification" ), // SPIString @@ -1510,7 +1510,8 @@ gchar const * sp_style_get_css_unit_string(int unit) { // specify px by default, see inkscape bug 1221626, mozilla bug 234789 - + // This is a problematic fix as some properties (e.g. 'line-height') have + // different behaviour if there is no unit. switch (unit) { case SP_CSS_UNIT_NONE: return "px"; @@ -1957,7 +1958,7 @@ sp_css_attr_scale(SPCSSAttr *css, double ex) sp_css_attr_scale_property_single(css, "kerning", ex); sp_css_attr_scale_property_single(css, "letter-spacing", ex); sp_css_attr_scale_property_single(css, "word-spacing", ex); - //sp_css_attr_scale_property_single(css, "line-height", ex, true); + sp_css_attr_scale_property_single(css, "line-height", ex, true); return css; } |