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/widgets/toolbox.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/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index f4d7ebf25..705c16d1f 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -55,7 +55,6 @@ #include "ui/tools-switch.h" #include "../ui/icon-names.h" #include "../ui/widget/style-swatch.h" -#include "../ui/widget/unit-tracker.h" #include "../verbs.h" #include "../widgets/button.h" #include "../widgets/spinbutton-events.h" @@ -516,7 +515,7 @@ static gchar const * ui_descr = " <toolitem action='TextSubscriptAction' />" " <separator />" " <toolitem action='TextLineHeightAction' />" - " <toolitem action='TextLineHeightUnitAction' />" + " <toolitem action='TextLineHeightUnitsAction' />" " <toolitem action='TextLetterSpacingAction' />" " <toolitem action='TextWordSpacingAction' />" " <toolitem action='TextDxAction' />" @@ -1124,10 +1123,6 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name, g_object_set_data( dataKludge, prefs->getEntry(path).getEntryName().data(), adj ); } - if (unit_tracker) { - unit_tracker->addAdjustment(adj); - } - // Using a cast just to make sure we pass in the right kind of function pointer g_object_set( G_OBJECT(act), "tool-post", static_cast<EgeWidgetFixup>(sp_set_font_size_smaller), NULL ); |