filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

[~andy/gtk] / gtk / gtksizegroup.c

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 480806f89a7cbaa89eb2c55a086d03dd9479c6a2..e31dfa84eb1755b30b53f228eeff280941a16989 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -25,6 +25,7 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtksizegroup-private.h"
+#include "gtksizerequestcacheprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcontainerprivate.h"
 
@@ -146,18 +147,23 @@ static void gtk_size_group_buildable_custom_finished (GtkBuildable  *buildable,
                                                      const gchar   *tagname,
                                                      gpointer       user_data);
 
+G_STATIC_ASSERT (GTK_SIZE_GROUP_HORIZONTAL == (1 << GTK_ORIENTATION_HORIZONTAL));
+G_STATIC_ASSERT (GTK_SIZE_GROUP_VERTICAL == (1 << GTK_ORIENTATION_VERTICAL));
+G_STATIC_ASSERT (GTK_SIZE_GROUP_BOTH == (GTK_SIZE_GROUP_HORIZONTAL | GTK_SIZE_GROUP_VERTICAL));
+
 static void
-add_widget_to_closure (GHashTable       *set,
-                       GtkWidget        *widget,
-                      GtkSizeGroupMode  mode)
+add_widget_to_closure (GHashTable     *widgets,
+                       GHashTable     *groups,
+                       GtkWidget      *widget,
+                      GtkOrientation  orientation)
 {
   GSList *tmp_groups, *tmp_widgets;
   gboolean hidden;
 
-  if (g_hash_table_lookup (set, widget))
+  if (g_hash_table_lookup (widgets, widget))
     return;
 
-  g_hash_table_insert (set, widget, widget);
+  g_hash_table_add (widgets, widget);
   hidden = !gtk_widget_is_visible (widget);
 
   for (tmp_groups = _gtk_widget_get_sizegroups (widget); tmp_groups; tmp_groups = tmp_groups->next)
@@ -165,28 +171,36 @@ add_widget_to_closure (GHashTable       *set,
       GtkSizeGroup        *tmp_group = tmp_groups->data;
       GtkSizeGroupPrivate *tmp_priv  = tmp_group->priv;
 
+      if (g_hash_table_lookup (groups, tmp_group))
+        continue;
+
       if (tmp_priv->ignore_hidden && hidden)
         continue;
 
-      if (tmp_priv->mode != GTK_SIZE_GROUP_BOTH && tmp_priv->mode != mode)
+      if (!(tmp_priv->mode & (1 << orientation)))
         continue;
 
+      g_hash_table_add (groups, tmp_group);
+
       for (tmp_widgets = tmp_priv->widgets; tmp_widgets; tmp_widgets = tmp_widgets->next)
-        add_widget_to_closure (set, tmp_widgets->data, mode);
+        add_widget_to_closure (widgets, groups, tmp_widgets->data, orientation);
     }
 }
 
-static GHashTable *
-widget_get_size_group_peers (GtkWidget        *widget,
-                             GtkSizeGroupMode  mode)
+GHashTable *
+_gtk_size_group_get_widget_peers (GtkWidget      *for_widget,
+                                  GtkOrientation  orientation)
 {
-  GHashTable *result;
+  GHashTable *widgets, *groups;
 
-  result = g_hash_table_new (g_direct_hash, g_direct_equal);
+  widgets = g_hash_table_new (g_direct_hash, g_direct_equal);
+  groups = g_hash_table_new (g_direct_hash, g_direct_equal);
 
-  add_widget_to_closure (result, widget, mode);
+  add_widget_to_closure (widgets, groups, for_widget, orientation);
 
-  return result;
+  g_hash_table_unref (groups);
+
+  return widgets;
 }
                                      
 static void
@@ -196,8 +210,7 @@ real_queue_resize (GtkWidget          *widget,
   GtkWidget *container;
 
   _gtk_widget_set_alloc_needed (widget, TRUE);
-  _gtk_widget_set_width_request_needed (widget, TRUE);
-  _gtk_widget_set_height_request_needed (widget, TRUE);
+  _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
 
   container = gtk_widget_get_parent (widget);
   if (!container &&
@@ -244,7 +257,7 @@ queue_resize_on_widget (GtkWidget          *widget,
          continue;
        }
 
-      widgets = widget_get_size_group_peers (parent, GTK_SIZE_GROUP_HORIZONTAL);
+      widgets = _gtk_size_group_get_widget_peers (parent, GTK_ORIENTATION_HORIZONTAL);
 
       g_hash_table_iter_init (&iter, widgets);
       while (g_hash_table_iter_next (&iter, &current, NULL))
@@ -264,7 +277,7 @@ queue_resize_on_widget (GtkWidget          *widget,
       
       g_hash_table_destroy (widgets);
       
-      widgets = widget_get_size_group_peers (parent, GTK_SIZE_GROUP_VERTICAL);
+      widgets = _gtk_size_group_get_widget_peers (parent, GTK_ORIENTATION_VERTICAL);
 
       g_hash_table_iter_init (&iter, widgets);
       while (g_hash_table_iter_next (&iter, &current, NULL))
@@ -624,69 +637,6 @@ gtk_size_group_get_widgets (GtkSizeGroup *size_group)
   return size_group->priv->widgets;
 }
 
-/**
- * _gtk_size_group_bump_requisition:
- * @widget: a #GtkWidget
- * @mode: either %GTK_SIZE_GROUP_HORIZONTAL or %GTK_SIZE_GROUP_VERTICAL, depending
- *        on the dimension in which to bump the size.
- * @for_size: Size to request minimum and natural size for
- * @minimum: a pointer to the widget's minimum size
- * @natural: a pointer to the widget's natural size
- *
- * Refreshes the sizegroup while returning the groups requested
- * value in the dimension @mode.
- *
- * This function is used both to update sizegroup minimum and natural size 
- * information and widget minimum and natural sizes in multiple passes from 
- * the size request apis.
- */
-void
-_gtk_size_group_bump_requisition (GtkWidget        *widget,
-                                 GtkSizeGroupMode  mode,
-                                  gint              for_size,
-                                 gint             *minimum,
-                                 gint             *natural)
-{
-  GHashTable *widgets;
-  GHashTableIter iter;
-  gpointer key;
-  gint    min_result = 0, nat_result = 0;
-
-  if (!_gtk_widget_get_sizegroups (widget))
-    return;
-
-  widgets = widget_get_size_group_peers (widget, mode);
-
-  g_hash_table_foreach (widgets, (GHFunc) g_object_ref, NULL);
-  
-  g_hash_table_iter_init (&iter, widgets);
-  while (g_hash_table_iter_next (&iter, &key, NULL))
-    {
-      GtkWidget *tmp_widget = key;
-      gint min_dimension, nat_dimension;
-
-      if (tmp_widget == widget)
-        {
-          min_dimension = *minimum;
-          nat_dimension = *natural;
-        }
-      else
-        {
-          _gtk_widget_compute_size_for_orientation (tmp_widget, mode, TRUE, for_size, &min_dimension, &nat_dimension);
-        }
-
-      min_result = MAX (min_result, min_dimension);
-      nat_result = MAX (nat_result, nat_dimension);
-    }
-
-  g_hash_table_foreach (widgets, (GHFunc) g_object_unref, NULL);
-
-  g_hash_table_destroy (widgets);
-
-  *minimum = min_result;
-  *natural = nat_result;
-}
-
 /**
  * _gtk_size_group_queue_resize:
  * @widget: a #GtkWidget