diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-19 20:10:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-19 20:10:36 +0000 |
| commit | 968cf01eb9a0b5248a91a697c502383e8dd7b00d (patch) | |
| tree | 63eaa397c29b2a562c585b1e924feb7c8e0f2329 /src/widgets | |
| parent | Start fixing Krzysztof review (diff) | |
| parent | Merge lp:~inkscape.dev/inkscape/copy-rotate-lpe-improvements (diff) | |
| download | inkscape-968cf01eb9a0b5248a91a697c502383e8dd7b00d.tar.gz inkscape-968cf01eb9a0b5248a91a697c502383e8dd7b00d.zip | |
update to trunk
(bzr r13682.1.35)
Diffstat (limited to 'src/widgets')
| -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 |