From: Timm Bäder <mail@baedert.org>
Date: Mon, 27 Dec 2021 09:00:30 +0000 (+0100)
Subject: applicationwindow: Don't pass for_size < -1 to measure()
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~5^2~7^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e94d5bf006e527919931d064900eaaa0dc907b9c;p=gtk4.git

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.
---

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);