diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-11-01 20:22:35 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-11-01 20:22:35 +0100 |
| commit | 0306278145af790c5edb5afebdef64dfa928cdcf (patch) | |
| tree | 61b37f011bcff761a53bfffa1751ec72b92d097e | |
| parent | 4067a45affeffed05b4f4e9c85e564b69e2c5c47 (diff) | |
| download | gtk+-0306278145af790c5edb5afebdef64dfa928cdcf.tar.gz | |
sizegroup: Always at least use widget's size
When widgets were hidden, they were otherwise assigned a 0 size.
| -rw-r--r-- | gtk/gtksizegroup.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index b5b043d59d..091505ad30 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -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; } |