]> Pileus Git - ~andy/gtk/commitdiff
sizegroup: Always at least use widget's size
authorBenjamin Otte <otte@redhat.com>
Thu, 1 Nov 2012 19:22:35 +0000 (20:22 +0100)
committerBenjamin Otte <otte@redhat.com>
Thu, 1 Nov 2012 19:22:35 +0000 (20:22 +0100)
When widgets were hidden, they were otherwise assigned a 0 size.

gtk/gtksizegroup.c

index b5b043d59d0440f786ff692ee5714673766c1afe..091505ad30ec65279326cbc7d5a515ea27d5de88 100644 (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;
            }