From f39251da501c0f934900cf0312ee599d4ece6cd9 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sun, 26 Apr 2020 02:09:09 +0000 Subject: [PATCH] Fix issue 125, Toolbar empty after startup. To test if fix 686. Set the default size of the window unseted and every thing works --- src/inkscape-window.cpp | 4 ---- src/widgets/desktop-widget.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp index 38810245a0..66d8c06fd4 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/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index b99ca9c214..4c494f819c 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1291,7 +1291,7 @@ SPDesktopWidget::setWindowSize (gint w, gint h) { if (window) { - window->set_default_size (w, h); + window->set_default_size (-1, -1); window->resize (w, h); } } -- GitLab