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

sizegroup: Always at least use widget's size

Browse Source 
When widgets were hidden, they were otherwise assigned a 0 size.
This commit is contained in:
Benjamin Otte 2012-11-01 20:22:35 +01:00
parent 4067a45aff
commit 0306278145
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtksizegroup.c
View File

@ -746,6 +746,11 @@ compute_dimension (GtkWidget *widget,
min_dimension = *minimum;
nat_dimension = *natural;
}
else if (!gtk_widget_get_mapped (tmp_widget) && priv->ignore_hidden)
{
min_dimension = 0;
nat_dimension = 0;
}
else
{
if (mode == GTK_SIZE_GROUP_HORIZONTAL)
@ -754,11 +759,8 @@ compute_dimension (GtkWidget *widget,
gtk_widget_get_preferred_height (tmp_widget, &min_dimension, &nat_dimension);
}
if (gtk_widget_get_mapped (tmp_widget) || !priv->ignore_hidden)
{
min_result = MAX (min_result, min_dimension);
nat_result = MAX (nat_result, nat_dimension);
}
min_result = MAX (min_result, min_dimension);
nat_result = MAX (nat_result, nat_dimension);
tmp_list = tmp_list->next;
}