From 26d0ee6707d1f2c11ed2f539ae8dbb851dfe7007 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Thu, 30 Apr 2020 03:15:21 +0200 Subject: [PATCH] Toolbar empty after startup. Some comboboxes in tool settings hidden for small window; do not appear in drop-down menu Fix https://gitlab.com/inkscape/inkscape/-/issues/125 Fix https://gitlab.com/inkscape/inkscape/-/issues/686 --- src/inkscape-window.cpp | 4 ---- src/widgets/toolbox.cpp | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp index 7d1e8093e3..74ea39a7c3 100644 --- a/src/inkscape-window.cpp +++ b/src/inkscape-window.cpp @@ -122,10 +122,6 @@ InkscapeWindow::setup_view() // the window, but a call to hide() causes Inkscape to just exit since the migration to Gtk::Application show(); - // TODO: Extra call seems to ensure toolbar widgets are visible after programmatic resize - // (incomplete workaround for https://gitlab.com/inkscape/inkscape/issues/125) - check_resize(); - sp_namedview_zoom_and_view_from_document(_desktop); sp_namedview_update_layers_from_document(_desktop); diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 94a04d73ed..b60fd59f3d 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -725,7 +725,15 @@ void update_aux_toolbox(SPDesktop * /*desktop*/, ToolBase *eventcontext, GtkWidg } else { gtk_widget_hide(sub_toolbox); } + //FIX issue #Inkscape686 + GtkAllocation allocation; + gtk_widget_get_allocation(sub_toolbox, &allocation); + gtk_widget_size_allocate(sub_toolbox, &allocation); } + //FIX issue #Inkscape125 + GtkAllocation allocation; + gtk_widget_get_allocation(toolbox, &allocation); + gtk_widget_size_allocate(toolbox, &allocation); } void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop) -- GitLab