Make display unit change roll out to toolbars

Add exception for measure tool, which uses preferences

Fixes https://gitlab.com/inkscape/inbox/issues/393
Partial fix: https://gitlab.com/inkscape/inkscape/issues/208

3 files changed, 4 insertions, 3 deletions

diff --git a/src/ui/toolbar/arc-toolbar.cpp b/src/ui/toolbar/arc-toolbar.cpp
index e9e25b7df..751efaa80 100644
--- a/src/ui/toolbar/arc-toolbar.cpp
+++ b/src/ui/toolbar/arc-toolbar.cpp
@@ -39,6 +39,7 @@
 #include "verbs.h"
 
 #include "object/sp-ellipse.h"
+#include "object/sp-namedview.h"
 
 #include "ui/icon-names.h"
 #include "ui/pref-pusher.h"
@@ -78,7 +79,7 @@ ArcToolbar::ArcToolbar(SPDesktop *desktop) :
         _freeze(false),
         _repr(nullptr)
 {
-    _tracker->setActiveUnit(unit_table.getUnit("px"));
+    _tracker->setActiveUnit(desktop->getNamedView()->display_units);
     auto prefs = Inkscape::Preferences::get();
 
     {
diff --git a/src/ui/toolbar/rect-toolbar.cpp b/src/ui/toolbar/rect-toolbar.cpp
index 960ddaac9..a8b49e62d 100644
--- a/src/ui/toolbar/rect-toolbar.cpp
+++ b/src/ui/toolbar/rect-toolbar.cpp
@@ -84,7 +84,7 @@ RectToolbar::RectToolbar(SPDesktop *desktop)
     // rx/ry units menu: create
     //tracker->addUnit( SP_UNIT_PERCENT, 0 );
     // fixme: add % meaning per cent of the width/height
-    _tracker->setActiveUnit(unit_table.getUnit("px"));
+    _tracker->setActiveUnit(desktop->getNamedView()->display_units);
     _mode_item->set_use_markup(true);
 
     /* W */
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index bd73fe584..3b55f8b08 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -265,7 +265,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
      _tracker(new UnitTracker(Inkscape::Util::UNIT_TYPE_LINEAR))
 {
     /* Line height unit tracker */
-    _tracker->prependUnit(unit_table.getUnit("")); // No unit
+    _tracker->prependUnit(unit_table.getUnit("")); // Ratio
     _tracker->addUnit(unit_table.getUnit("%"));
     _tracker->addUnit(unit_table.getUnit("em"));
     _tracker->addUnit(unit_table.getUnit("ex"));