From: Matthias Clasen Date: Sat, 24 Jul 2021 22:41:09 +0000 (-0400) Subject: sizerequest: Keep branches in sync X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~3^2~1^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0d8dd0c664594e468e09014e8f8ada749992994a;p=gtk4.git sizerequest: Keep branches in sync There are some unintentional differences between the path that uses a layout manager, and the path that uses widget vfuncs. Sync them up. --- diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index 935112061a..0a1bc48774 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -272,13 +272,13 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget, gtk_widget_measure (widget, OPPOSITE_ORIENTATION (orientation), -1, &minimum_for_size, &natural_for_size, NULL, NULL); - /* TODO: Warn if the given for_size is too small? */ if (for_size < MAX (minimum_for_size, css_min_for_size)) for_size = MAX (minimum_for_size, css_min_for_size); adjusted_for_size = for_size - widget_margins_for_size; - adjusted_for_size -= css_extra_for_size; + if (adjusted_for_size < 0) + adjusted_for_size = MAX (minimum_for_size, css_min_for_size); push_recursion_check (widget, orientation); widget_class->measure (widget,