brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window-actor/wayland: Skip unnecessary set_child_at_index() calls

Browse Source 
`clutter_actor_set_child_at_index()` is far from a no-op, even if
the current index is equal to the new one - presumably for good
reasons. For the use-case here we want it to be a no-op though, so
skip calling it if the index already matches.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2501>
This commit is contained in:
Robert Mader 2022-07-09 14:27:35 +02:00 committed by Marge Bot
parent 57881ba612
commit 0f8f30c93f
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/compositor/meta-window-actor-wayland.c
View File

@ -55,23 +55,26 @@ set_surface_actor_index (GNode *node,
gpointer data) gpointer data)
{ {
MetaWaylandSurface *surface = node->data; MetaWaylandSurface *surface = node->data;
MetaSurfaceActor *surface_actor = meta_wayland_surface_get_actor (surface);
SurfaceTreeTraverseData *traverse_data = data; SurfaceTreeTraverseData *traverse_data = data;
ClutterActor *window_actor = CLUTTER_ACTOR (traverse_data->window_actor);
ClutterActor *surface_actor =
CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));
if (clutter_actor_contains (CLUTTER_ACTOR (traverse_data->window_actor), if (clutter_actor_contains (window_actor, surface_actor))
CLUTTER_ACTOR (surface_actor)))
{ {
clutter_actor_set_child_at_index ( if (clutter_actor_get_child_at_index (window_actor, traverse_data->index) !=
CLUTTER_ACTOR (traverse_data->window_actor), surface_actor)
CLUTTER_ACTOR (surface_actor), {
traverse_data->index); clutter_actor_set_child_at_index (window_actor,
surface_actor,
traverse_data->index);
}
} }
else else
{ {
clutter_actor_insert_child_at_index ( clutter_actor_insert_child_at_index (window_actor,
CLUTTER_ACTOR (traverse_data->window_actor), surface_actor,
CLUTTER_ACTOR (surface_actor), traverse_data->index);
traverse_data->index);
} }
traverse_data->index++; traverse_data->index++;