AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

widget: Split out gtk_widget_ensure_allocate_on_children()

Browse Source 
allocate() should not be calling into ensure_allocate(), they do a similar job.
In the end, the code does the same work, but it should be easier to follow now.
This commit is contained in:
Benjamin Otte 2023-03-08 18:23:50 +00:00 committed by Matthias Clasen
parent ffb7177c2e
commit c8d356a250
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtkwidget.c
View File

@ -3871,6 +3871,28 @@ gtk_widget_adjust_size_allocation (GtkWidget *widget,
} }
} }
static void
gtk_widget_ensure_allocate_on_children (GtkWidget *widget)
{
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
GtkWidget *child;
g_assert (!priv->resize_needed);
g_assert (!priv->alloc_needed);
if (!priv->alloc_needed_on_child)
return;
priv->alloc_needed_on_child = FALSE;
for (child = _gtk_widget_get_first_child (widget);
child != NULL;
child = _gtk_widget_get_next_sibling (child))
{
gtk_widget_ensure_allocate (child);
}
}
/** /**
* gtk_widget_allocate: * gtk_widget_allocate:
* @widget: A `GtkWidget` * @widget: A `GtkWidget`
@ -4038,7 +4060,7 @@ gtk_widget_allocate (GtkWidget *widget,
if (!alloc_needed && !size_changed && !baseline_changed) if (!alloc_needed && !size_changed && !baseline_changed)
{ {
gtk_widget_ensure_allocate (widget); gtk_widget_ensure_allocate_on_children (widget);
goto skip_allocate; goto skip_allocate;
} }
@ -10685,18 +10707,9 @@ gtk_widget_ensure_allocate (GtkWidget *widget)
priv->allocated_size_baseline, priv->allocated_size_baseline,
gsk_transform_ref (priv->allocated_transform)); gsk_transform_ref (priv->allocated_transform));
} }
else if (priv->alloc_needed_on_child) else
{ {
GtkWidget *child; gtk_widget_ensure_allocate_on_children (widget);
priv->alloc_needed_on_child = FALSE;
for (child = _gtk_widget_get_first_child (widget);
child != NULL;
child = _gtk_widget_get_next_sibling (child))
{
gtk_widget_ensure_allocate (child);
}
} }
} }