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

sizegroup: Merge function into only caller

Browse Source
This commit is contained in:
Benjamin Otte 2015-09-28 21:17:21 +02:00
parent b5dfe9b833
commit 4fa74e68e9
1 changed files with 34 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
gtk/gtksizegroup.c
View File

@ -214,53 +214,6 @@ queue_resize_on_group (GtkSizeGroup *size_group)
} }
} }
static void
queue_resize_on_widget (GtkWidget *widget,
gboolean check_siblings)
{
GtkWidget *parent;
parent = widget;
do
{
if (gtk_widget_get_resize_needed (parent))
return;
gtk_widget_queue_resize_on_widget (parent);
if (!check_siblings)
{
check_siblings = TRUE;
}
else
{
GSList *groups, *l;
groups = _gtk_widget_get_sizegroups (parent);
for (l = groups; l; l = l->next)
{
if (((GtkSizeGroup *) (l->data))->priv->ignore_hidden && !gtk_widget_is_visible (widget))
continue;
queue_resize_on_group (l->data);
}
}
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (GTK_IS_RESIZE_CONTAINER (parent))
{
gtk_container_queue_resize_handler (GTK_CONTAINER (parent));
break;
}
G_GNUC_END_IGNORE_DEPRECATIONS;
parent = _gtk_widget_get_parent (parent);
}
while (parent);
}
static void static void
gtk_size_group_class_init (GtkSizeGroupClass *klass) gtk_size_group_class_init (GtkSizeGroupClass *klass)
{ {
@ -575,7 +528,40 @@ gtk_size_group_get_widgets (GtkSizeGroup *size_group)
void void
_gtk_size_group_queue_resize (GtkWidget *widget) _gtk_size_group_queue_resize (GtkWidget *widget)
{ {
queue_resize_on_widget (widget, TRUE); GtkWidget *parent;
GSList *groups, *l;
parent = widget;
do
{
if (gtk_widget_get_resize_needed (parent))
return;
gtk_widget_queue_resize_on_widget (parent);
groups = _gtk_widget_get_sizegroups (parent);
for (l = groups; l; l = l->next)
{
if (((GtkSizeGroup *) (l->data))->priv->ignore_hidden && !gtk_widget_is_visible (widget))
continue;
queue_resize_on_group (l->data);
}
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (GTK_IS_RESIZE_CONTAINER (parent))
{
gtk_container_queue_resize_handler (GTK_CONTAINER (parent));
break;
}
G_GNUC_END_IGNORE_DEPRECATIONS;
parent = _gtk_widget_get_parent (parent);
}
while (parent);
} }
typedef struct { typedef struct {