Skip to content

wayland/subsurface: Move actor unparenting back to rebuild_surface_tr… #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sunderland93 wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −28
Open

wayland/subsurface: Move actor unparenting back to rebuild_surface_tr… #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 47 additions & 12 deletions src/compositor/meta-window-actor-wayland.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,43 @@ typedef struct _SurfaceTreeTraverseData
} SurfaceTreeTraverseData;

static gboolean
set_surface_actor_index (GNode *node,
gpointer data)
get_surface_actor_list (GNode *node,
gpointer data)
{
MetaWaylandSurface *surface = node->data;
MetaSurfaceActor *surface_actor = meta_wayland_surface_get_actor (surface);
Copy link
Member

@mtwebster mtwebster Feb 17, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can return NULL, is that ok?

I guess maybe just return FALSE in that case...

GList **surface_actors = data;

*surface_actors = g_list_prepend (*surface_actors, surface_actor);
return FALSE;
}

static gboolean
set_surface_actor_index (GNode *node,
gpointer data)
{
MetaWaylandSurface *surface = node->data;
SurfaceTreeTraverseData *traverse_data = data;

if (clutter_actor_contains (CLUTTER_ACTOR (traverse_data->window_actor),
CLUTTER_ACTOR (surface_actor)))
ClutterActor *window_actor = CLUTTER_ACTOR (traverse_data->window_actor);
ClutterActor *surface_actor =
CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));
Copy link
Member

@mtwebster mtwebster Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here I guess (though it's not new) - you'd get warnings here and in clutter_actor_contains()


if (clutter_actor_contains (window_actor, surface_actor))
{
clutter_actor_set_child_at_index (
CLUTTER_ACTOR (traverse_data->window_actor),
CLUTTER_ACTOR (surface_actor),
traverse_data->index);
if (clutter_actor_get_child_at_index (window_actor, traverse_data->index) !=
surface_actor)
{
clutter_actor_set_child_at_index (window_actor,
surface_actor,
traverse_data->index);
}
}
else
{
clutter_actor_insert_child_at_index (
CLUTTER_ACTOR (traverse_data->window_actor),
CLUTTER_ACTOR (surface_actor),
traverse_data->index);
clutter_actor_insert_child_at_index (window_actor,
surface_actor,
traverse_data->index);
}
traverse_data->index++;

Expand All @@ -75,8 +90,28 @@ meta_window_actor_wayland_rebuild_surface_tree (MetaWindowActor *actor)
MetaWaylandSurface *surface = meta_surface_actor_wayland_get_surface (
META_SURFACE_ACTOR_WAYLAND (surface_actor));
GNode *root_node = surface->subsurface_branch_node;
g_autoptr (GList) surface_actors = NULL;
g_autoptr (GList) children = NULL;
GList *l;
SurfaceTreeTraverseData traverse_data;

g_node_traverse (root_node,
G_IN_ORDER,
G_TRAVERSE_LEAVES,
-1,
get_surface_actor_list,
&surface_actors);

children = clutter_actor_get_children (CLUTTER_ACTOR (actor));
for (l = children; l; l = l->next)
{
ClutterActor *child_actor = l->data;

if (META_IS_SURFACE_ACTOR_WAYLAND (child_actor) &&
!g_list_find (surface_actors, child_actor))
clutter_actor_remove_child (CLUTTER_ACTOR (actor), child_actor);
}

traverse_data = (SurfaceTreeTraverseData) {
.window_actor = actor,
.index = 0,
Expand Down
17 changes: 1 addition & 16 deletions src/wayland/meta-wayland-subsurface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,31 +281,16 @@ meta_wayland_subsurface_class_init (MetaWaylandSubsurfaceClass *klass)
meta_wayland_subsurface_sync_actor_state;
}

static void
unparent_actor (MetaWaylandSurface *surface)
{
ClutterActor *actor;
ClutterActor *parent_actor;

actor = CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));
if (!actor)
return;

parent_actor = clutter_actor_get_parent (actor);
if (parent_actor)
clutter_actor_remove_child (parent_actor, actor);
}

static void
wl_subsurface_destructor (struct wl_resource *resource)
{
MetaWaylandSurface *surface = wl_resource_get_user_data (resource);

g_node_unlink (surface->subsurface_branch_node);
unparent_actor (surface);

if (surface->sub.parent)
{
meta_wayland_surface_notify_subsurface_state_changed (surface->sub.parent);
wl_list_remove (&surface->sub.parent_destroy_listener.link);
surface->sub.parent = NULL;
}
Expand Down
Loading