AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Remove goto usage in widget_allocate()

Browse Source
This commit is contained in:
Benjamin Otte 2023-03-08 18:27:46 +00:00 committed by Matthias Clasen
parent c8d356a250
commit 7a3e130efd
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
gtk/gtkwidget.c
View File

@ -4061,52 +4061,53 @@ gtk_widget_allocate (GtkWidget *widget,
if (!alloc_needed && !size_changed && !baseline_changed) if (!alloc_needed && !size_changed && !baseline_changed)
{ {
gtk_widget_ensure_allocate_on_children (widget); gtk_widget_ensure_allocate_on_children (widget);
goto skip_allocate;
}
priv->width = adjusted.width;
priv->height = adjusted.height;
priv->baseline = baseline;
priv->alloc_needed_on_child = FALSE;
if (priv->layout_manager != NULL)
{
gtk_layout_manager_allocate (priv->layout_manager, widget,
priv->width,
priv->height,
baseline);
} }
else else
{ {
GTK_WIDGET_GET_CLASS (widget)->size_allocate (widget, priv->width = adjusted.width;
priv->width, priv->height = adjusted.height;
priv->height, priv->baseline = baseline;
baseline);
}
/* Size allocation is god... after consulting god, no further requests or allocations are needed */ priv->alloc_needed_on_child = FALSE;
if (priv->layout_manager != NULL)
{
gtk_layout_manager_allocate (priv->layout_manager, widget,
priv->width,
priv->height,
baseline);
}
else
{
GTK_WIDGET_GET_CLASS (widget)->size_allocate (widget,
priv->width,
priv->height,
baseline);
}
/* Size allocation is god... after consulting god, no further requests or allocations are needed */
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
if (GTK_DISPLAY_DEBUG_CHECK (_gtk_widget_get_display (widget), GEOMETRY) && if (GTK_DISPLAY_DEBUG_CHECK (_gtk_widget_get_display (widget), GEOMETRY) &&
gtk_widget_get_resize_needed (widget)) gtk_widget_get_resize_needed (widget))
{ {
g_warning ("%s %p or a child called gtk_widget_queue_resize() during size_allocate().", g_warning ("%s %p or a child called gtk_widget_queue_resize() during size_allocate().",
gtk_widget_get_name (widget), widget); gtk_widget_get_name (widget), widget);
} }
#endif #endif
gtk_widget_ensure_resize (widget); gtk_widget_ensure_resize (widget);
priv->alloc_needed = FALSE; priv->alloc_needed = FALSE;
gtk_widget_update_paintables (widget); gtk_widget_update_paintables (widget);
if (size_changed) if (size_changed)
gtk_accessible_bounds_changed (GTK_ACCESSIBLE (widget)); gtk_accessible_bounds_changed (GTK_ACCESSIBLE (widget));
skip_allocate: if (size_changed || baseline_changed)
if (size_changed || baseline_changed) gtk_widget_queue_draw (widget);
gtk_widget_queue_draw (widget); }
else if (transform_changed && priv->parent)
if (transform_changed && priv->parent)
gtk_widget_queue_draw (priv->parent); gtk_widget_queue_draw (priv->parent);
out: out: