From 9db06f0ff1f297754e328eb5909e98792091b6ec Mon Sep 17 00:00:00 2001
From: Nathan Lee <2431820-nathanal@users.noreply.gitlab.com>
Date: Fri, 26 Apr 2019 14:10:54 +1000
Subject: 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
---
 src/ui/toolbar/arc-toolbar.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/toolbar/arc-toolbar.cpp')

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();
 
     {
-- 
cgit v1.2.3