diff options
| author | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-04-26 04:10:54 +0000 |
|---|---|---|
| committer | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-04-30 12:01:19 +0000 |
| commit | 9db06f0ff1f297754e328eb5909e98792091b6ec (patch) | |
| tree | 5e66aba0e03b3c6677f0220f30ff7a1f9cf217f9 /src/widgets | |
| parent | Simplify UI for LPE add (diff) | |
| download | inkscape-9db06f0ff1f297754e328eb5909e98792091b6ec.tar.gz inkscape-9db06f0ff1f297754e328eb5909e98792091b6ec.zip | |
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
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 2 |
2 files changed, 4 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; diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index d3daa892f..e3b95fa2b 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -198,6 +198,7 @@ static struct { SP_VERB_INVALID, nullptr, nullptr}, { "/tools/zoom", "zoom_toolbox", Inkscape::UI::Toolbar::ZoomToolbar::create, nullptr, "ZoomToolbar", SP_VERB_INVALID, nullptr, nullptr}, + // If you change MeasureToolbar here, change it also in desktop-widget.cpp { "/tools/measure", "measure_toolbox", Inkscape::UI::Toolbar::MeasureToolbar::create, nullptr, "MeasureToolbar", SP_VERB_INVALID, nullptr, nullptr}, { "/tools/shapes/star", "star_toolbox", Inkscape::UI::Toolbar::StarToolbar::create, nullptr, "StarToolbar", @@ -819,6 +820,7 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) gtk_container_add(GTK_CONTAINER(toolbox), holder); gtk_size_group_add_widget(grouper, holder); sp_set_font_size_smaller( holder ); + gtk_widget_set_name( holder, aux_toolboxes[i].ui_name ); // TODO: We could make the toolbox a custom subclass of GtkEventBox // so that we can store a list of toolbars, rather than using |