diff options
| author | Martin Owens <doctormo@gmail.com> | 2016-03-15 03:37:29 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2016-03-15 03:37:29 +0000 |
| commit | d832c91bf21f6649c1ca7b35bfa7ac67b7832cc3 (patch) | |
| tree | c759705e85962c4b13a2cf386c9a435e1acb32a4 /src/widgets/text-toolbar.cpp | |
| parent | Order LPE list (diff) | |
| download | inkscape-d832c91bf21f6649c1ca7b35bfa7ac67b7832cc3.tar.gz inkscape-d832c91bf21f6649c1ca7b35bfa7ac67b7832cc3.zip | |
Commit to using our stored units for now.
(bzr r14707)
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index c49f0bc05..60e932338 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1106,9 +1106,11 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ lh_unit = unit_table.getUnit("%"); height = query.line_height.value * 100; } else { - 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); + //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; } // Set before value is set |