From affb3de829dfb285295bd481713ebe5a40d4adfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sat, 9 May 2020 18:49:05 +0200 Subject: [PATCH] clutter/actor: Don't layout children inside set_allocation() Now that we no longer have the DELEGATE_LAYOUT we expect all actors overriding the allocate() vfunc to allocate their children themselves. Since clutter_actor_set_allocation() is only called from custom vfunc_allocate() implementations, the condition in clutter_actor_maybe_layout_children() would always fail, which makes calling the function useless anyway. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1245 --- clutter/clutter/clutter-actor.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index fd4532b1e..c134edffd 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -10338,13 +10338,6 @@ clutter_actor_set_allocation (ClutterActor *self, changed = clutter_actor_set_allocation_internal (self, box, flags); - /* we allocate our children before we notify changes in our geometry, - * so that people connecting to properties will be able to get valid - * data out of the sub-tree of the scene graph that has this actor at - * the root. - */ - clutter_actor_maybe_layout_children (self, box, flags); - if (changed) { ClutterActorBox signal_box = priv->allocation;