From f90b768ea040529fe33fda7e20f5fe2765de1dd0 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 21 Dec 2016 10:25:32 -0800 Subject: [PATCH] Fix generic wxWindow when used in toolbar GtkToolbar uses item minimum size as actual size, so don't use 0 as minimum for toolbar children. See #17756, #17704 (cherry picked from commit 2155eb2fdef5b2db0fd18a709193ca00373f3b11) --- src/gtk/win_gtk.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 192e212260..fa6cc0a20a 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -230,7 +230,12 @@ static void pizza_adjust_size_request(GtkWidget* widget, GtkOrientation orientat parent_class->adjust_size_request(widget, orientation, minimum, natural); // Override adjustments to minimum size. GtkWidgetClass.adjust_size_request() // will use the size request, if set, as the minimum. - *minimum = 0; + // But don't override if in a GtkToolbar, it uses the minimum as actual size. + GtkWidget* parent = gtk_widget_get_parent(widget); + if (parent) + parent = gtk_widget_get_parent(parent); + if (!GTK_IS_TOOL_ITEM(parent)) + *minimum = 0; } // Needed to implement GtkScrollable interface, but we don't care about the