Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget: Simplify size allocation

Browse Source 
Don't call ensure_allocate if we've just
done size_allocate. This makes criticals
from reshowing popovers go away.
This commit is contained in:
Matthias Clasen
2023-03-08 13:06:53 -05:00
committed by Mat
parent fc4044bbce
commit d671fdab7c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkwidget.c
View File

@@ -4020,7 +4020,10 @@ gtk_widget_allocate (GtkWidget *widget,
size_changed = (priv->width != adjusted.width) || (priv->height != adjusted.height);
if (!alloc_needed && !size_changed && !baseline_changed)
goto skip_allocate;
{
gtk_widget_ensure_allocate (widget);
goto skip_allocate;
}
priv->width = adjusted.width;
priv->height = adjusted.height;
@@ -4068,9 +4071,6 @@ skip_allocate:
gtk_widget_queue_draw (priv->parent);
out:
if (priv->alloc_needed_on_child)
gtk_widget_ensure_allocate (widget);
gtk_widget_pop_verify_invariants (widget);
}