From 04c550bfb5b23a8aa7c56749ad5734a79bb24bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 20 Oct 2017 10:58:31 +0200 Subject: [PATCH] window: Make sure we query the window size before size-allocate'ing --- gtk/gtkwindow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 64d9304676..c5d9c17ae3 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -8926,6 +8926,7 @@ gtk_window_move_resize (GtkWindow *window) else { GtkAllocation allocation, clip; + GtkRequisition minsize; /* Handle any position changes. */ @@ -8935,13 +8936,15 @@ gtk_window_move_resize (GtkWindow *window) new_request.x, new_request.y); } + gtk_widget_get_preferred_size (widget, &minsize, NULL); + /* Our configure request didn't change size, but maybe some of * our child widgets have. Run a size allocate with our current * size to make sure that we re-layout our child widgets. */ allocation.x = 0; allocation.y = 0; - allocation.width = current_width; - allocation.height = current_height; + allocation.width = MAX (current_width, minsize.width); + allocation.height = MAX (current_height, minsize.height); gtk_widget_size_allocate (widget, &allocation, -1, &clip); }