diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2016-03-18 10:22:38 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2016-03-18 10:22:38 +0000 |
| commit | 5051da96adc06f2d05c508c2b0ec6ba236d3fdc9 (patch) | |
| tree | 1e672c20144c77f9caa783bfc3d2b2a173c64555 /src/widgets/text-toolbar.cpp | |
| parent | Fix writing of 'x' and 'y' attributes in multiline text via sodipode:role="li... (diff) | |
| download | inkscape-5051da96adc06f2d05c508c2b0ec6ba236d3fdc9.tar.gz inkscape-5051da96adc06f2d05c508c2b0ec6ba236d3fdc9.zip | |
Revert 14707
(bzr r14716.1.1)
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 60e932338..c49f0bc05 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1106,11 +1106,9 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ lh_unit = unit_table.getUnit("%"); height = query.line_height.value * 100; } else { - //Unit const *active = tracker->getActiveUnit(); - // This allows us to show the unit stored to the user, but right now - // it's always px (because Tav said other units are broken/2016) - lh_unit = unit_table.getUnit(query.line_height.unit); - height = query.line_height.computed; + lh_unit = tracker->getActiveUnit(); + // Can get unit like this: unit_table.getUnit(query.line_height.unit); + height = Inkscape::Util::Quantity::convert(query.line_height.computed, "px", lh_unit); } // Set before value is set |