summaryrefslogtreecommitdiffstats
path: root/src/widgets/desktop-widget.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2019-04-30 20:40:33 +0000
committerDiederik van Lierop <mail@diedenrezi.nl>2019-04-30 20:40:33 +0000
commitd137944b06575b9e79d0a3e79a3e5f5b8f6665e2 (patch)
tree6017a86cc0040ca9d7615c879036bd320f6e5de7 /src/widgets/desktop-widget.cpp
parentFix disappearing and antialiasing of grid lines (diff)
parentSet spacing in About Dialog (diff)
downloadinkscape-d137944b06575b9e79d0a3e79a3e5f5b8f6665e2.tar.gz
inkscape-d137944b06575b9e79d0a3e79a3e5f5b8f6665e2.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
-rw-r--r--src/widgets/desktop-widget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 7386f2fa5..a50427c09 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1769,10 +1769,10 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
// Don't apply to text toolbar. We want to be able to
// use different units for text. (Bug 1562217)
const Glib::ustring name = j->get_name();
- if ( name == "TextToolbar")
+ if ( name == "TextToolbar" || name == "MeasureToolbar")
continue;
- gpointer t = sp_search_by_data_recursive(GTK_WIDGET(j->gobj()), (gpointer) "tracker");
+ gpointer t = sp_search_by_data_recursive(GTK_WIDGET(j->gobj()), (gpointer) "unit-tracker");
if (t == nullptr) // didn't find any tracker data
continue;