AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

window: Properly propagate for_size=-1

Browse Source
This commit is contained in:
Timm Bäder 2016-11-12 14:34:53 +01:00
parent 0d88fe65ba
commit 4e445e8e53
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwindow.c
View File

@ -693,7 +693,7 @@ gtk_window_measure (GtkWidget *widget,
gtk_widget_measure (priv->title_box,
orientation,
MAX (size, 0),
MAX (size, -1),
&title_min_size, &title_nat_size,
NULL, NULL);
}
@ -703,7 +703,7 @@ gtk_window_measure (GtkWidget *widget,
{
gtk_widget_measure (child,
orientation,
MAX (for_size, 0),
MAX (for_size, -1),
&child_min_size, &child_nat_size,
NULL, NULL);
@ -7320,10 +7320,10 @@ _gtk_window_set_allocation (GtkWindow *window,
MAX (1, (gint) allocation->width -
window_border.left - window_border.right);
gtk_widget_get_preferred_height_for_width (priv->title_box,
title_allocation.width,
NULL,
&priv->title_height);
gtk_widget_measure (priv->title_box, GTK_ORIENTATION_VERTICAL,
title_allocation.width,
NULL, &priv->title_height,
NULL, NULL);
title_allocation.height = priv->title_height;