From e94d5bf006e527919931d064900eaaa0dc907b9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Mon, 27 Dec 2021 10:00:30 +0100 Subject: [PATCH] applicationwindow: Don't pass for_size < -1 to measure() If the application window is measured with for_size -1 horizontally, this code clearly passes something lower to the parent class measure() implementation. Only subtract the menubar_height if we're passed a for_size > -1. --- gtk/gtkapplicationwindow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index e7747f9a6c..170759d772 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -435,9 +435,11 @@ gtk_application_window_measure (GtkWidget *widget, gtk_widget_measure (priv->menubar, GTK_ORIENTATION_VERTICAL, for_size, &menubar_height, NULL, NULL, NULL); + GTK_WIDGET_CLASS (gtk_application_window_parent_class)->measure (widget, orientation, - for_size - menubar_height, + for_size > -1 ? + for_size - menubar_height : -1, minimum, natural, minimum_baseline, natural_baseline); -- 2.30.2