callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paned: Shrinkable widgets don't require a size

Browse Source 
This could otherwise lead to very funny size request behaviors, in
particular in empathy.

https://bugzilla.gnome.org/show_bug.cgi?id=587441
This commit is contained in:
Benjamin Otte
2012-04-05 11:30:41 +02:00
committed by Guillaume Desmottes
parent 7b0fd635fa
commit 12d6b0fe62
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkpaned.c
View File

@ -904,7 +904,10 @@ gtk_paned_get_preferred_size (GtkWidget *widget,
if (priv->child1 && gtk_widget_get_visible (priv->child1)) if (priv->child1 && gtk_widget_get_visible (priv->child1))
{ {
get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat); get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat);
*minimum = child_min; if (priv->child1_shrink && priv->orientation == orientation)
*minimum = 0;
else
*minimum = child_min;
*natural = child_nat; *natural = child_nat;
} }
@ -914,7 +917,8 @@ gtk_paned_get_preferred_size (GtkWidget *widget,
if (priv->orientation == orientation) if (priv->orientation == orientation)
{ {
*minimum += child_min; if (!priv->child2_shrink)
*minimum += child_min;
*natural += child_nat; *natural += child_nat;
} }
else else