#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtksizegroup-private.h"
+#include "gtksizerequestcacheprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkcontainerprivate.h"
const gchar *tagname,
gpointer user_data);
-static void
-mark_widget_unvisited (GtkWidget *widget)
-{
- _gtk_widget_set_sizegroup_visited (widget, FALSE);
-}
+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 (GtkWidget *widget,
- GtkSizeGroupMode mode,
- GSList **widgets)
+add_widget_to_closure (GHashTable *widgets,
+ GHashTable *groups,
+ GtkWidget *widget,
+ GtkOrientation orientation)
{
GSList *tmp_groups, *tmp_widgets;
gboolean hidden;
- if (_gtk_widget_get_sizegroup_visited (widget))
+ if (g_hash_table_lookup (widgets, widget))
return;
- *widgets = g_slist_prepend (*widgets, widget);
- _gtk_widget_set_sizegroup_visited (widget, TRUE);
- hidden = !gtk_widget_get_mapped (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)
{
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 (tmp_widgets->data, mode, widgets);
+ add_widget_to_closure (widgets, groups, tmp_widgets->data, orientation);
}
}
-static GSList *
-widget_get_size_group_peers (GtkWidget *widget,
- GtkSizeGroupMode mode)
+GHashTable *
+_gtk_size_group_get_widget_peers (GtkWidget *for_widget,
+ GtkOrientation orientation)
{
- GSList *result = NULL;
+ GHashTable *widgets, *groups;
- add_widget_to_closure (widget, mode, &result);
- g_slist_foreach (result, (GFunc) mark_widget_unvisited, NULL);
+ widgets = g_hash_table_new (g_direct_hash, g_direct_equal);
+ groups = g_hash_table_new (g_direct_hash, g_direct_equal);
- return result;
+ add_widget_to_closure (widgets, groups, for_widget, orientation);
+
+ g_hash_table_unref (groups);
+
+ return widgets;
}
static void
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 &&
GtkQueueResizeFlags flags)
{
GtkWidget *parent = widget;
- GSList *tmp_list;
while (parent)
{
GSList *widget_groups;
- GSList *widgets;
+ GHashTable *widgets;
+ GHashTableIter iter;
+ gpointer current;
if (widget == parent && !check_siblings)
{
continue;
}
- widgets = widget_get_size_group_peers (parent, GTK_SIZE_GROUP_HORIZONTAL);
+ widgets = _gtk_size_group_get_widget_peers (parent, GTK_ORIENTATION_HORIZONTAL);
- for (tmp_list = widgets; tmp_list; tmp_list = tmp_list->next)
+ g_hash_table_iter_init (&iter, widgets);
+ while (g_hash_table_iter_next (&iter, ¤t, NULL))
{
- if (tmp_list->data == parent)
+ if (current == parent)
{
if (widget == parent)
real_queue_resize (parent, flags);
}
- else if (tmp_list->data == widget)
+ else if (current == widget)
{
g_warning ("A container and its child are part of this SizeGroup");
}
else
- queue_resize_on_widget (tmp_list->data, FALSE, flags);
+ queue_resize_on_widget (current, FALSE, flags);
}
- g_slist_free (widgets);
-
- widgets = widget_get_size_group_peers (parent, GTK_SIZE_GROUP_VERTICAL);
+ g_hash_table_destroy (widgets);
+
+ widgets = _gtk_size_group_get_widget_peers (parent, GTK_ORIENTATION_VERTICAL);
- for (tmp_list = widgets; tmp_list; tmp_list = tmp_list->next)
+ g_hash_table_iter_init (&iter, widgets);
+ while (g_hash_table_iter_next (&iter, ¤t, NULL))
{
- if (tmp_list->data == parent)
+ if (current == parent)
{
if (widget == parent)
real_queue_resize (parent, flags);
}
- else if (tmp_list->data == widget)
+ else if (current == widget)
{
g_warning ("A container and its child are part of this SizeGroup");
}
else
- queue_resize_on_widget (tmp_list->data, FALSE, flags);
+ queue_resize_on_widget (current, FALSE, flags);
}
- g_slist_free (widgets);
+ g_hash_table_destroy (widgets);
parent = gtk_widget_get_parent (parent);
}
return size_group->priv->widgets;
}
-static void
-compute_dimension (GtkWidget *widget,
- GtkSizeGroupMode mode,
- gint for_size,
- gint *minimum, /* in-out */
- gint *natural) /* in-out */
-{
- GSList *widgets;
- GSList *tmp_list;
- gint min_result = 0, nat_result = 0;
-
- widgets = widget_get_size_group_peers (widget, mode);
-
- g_slist_foreach (widgets, (GFunc)g_object_ref, NULL);
-
- for (tmp_list = widgets; tmp_list; tmp_list = tmp_list->next)
- {
- GtkWidget *tmp_widget = tmp_list->data;
- gint min_dimension, nat_dimension;
-
- if (tmp_widget == widget)
- {
- min_dimension = *minimum;
- nat_dimension = *natural;
- }
- else
- {
- if (mode == GTK_SIZE_GROUP_HORIZONTAL)
- {
- if (for_size < 0)
- gtk_widget_get_preferred_width (tmp_widget, &min_dimension, &nat_dimension);
- else
- gtk_widget_get_preferred_width_for_height (tmp_widget, for_size, &min_dimension, &nat_dimension);
- }
- else
- {
- if (for_size < 0)
- gtk_widget_get_preferred_height (tmp_widget, &min_dimension, &nat_dimension);
- else
- gtk_widget_get_preferred_height_for_width (tmp_widget, for_size, &min_dimension, &nat_dimension);
- }
- }
-
- min_result = MAX (min_result, min_dimension);
- nat_result = MAX (nat_result, nat_dimension);
- }
-
- g_slist_foreach (widgets, (GFunc)g_object_unref, NULL);
-
- g_slist_free (widgets);
-
- *minimum = min_result;
- *natural = nat_result;
-}
-
-/**
- * _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)
-{
- if (!_gtk_widget_get_sizegroup_bumping (widget))
- {
- /* Avoid recursion here */
- _gtk_widget_set_sizegroup_bumping (widget, TRUE);
-
- if (_gtk_widget_get_sizegroups (widget))
- compute_dimension (widget, mode, for_size, minimum, natural);
-
- _gtk_widget_set_sizegroup_bumping (widget, FALSE);
- }
-}
-
-
-
/**
* _gtk_size_group_queue_resize:
* @widget: a #GtkWidget
projects / ~andy / gtk / blobdiff