xwayland.c: Fix xwayland views activating themself before mapping

This commit is contained in:
Consolatis 2022-02-22 10:01:49 +01:00 committed by Johan Malm
parent a2523081e2
commit 17d83402ee
2 changed files with 2 additions and 2 deletions

View file

@ -63,7 +63,7 @@ unmanaged_handle_map(struct wl_listener *listener, void *data)
int ly = unmanaged->ly;
struct wlr_scene_node *parent, *node;
struct view *view = parent_view(unmanaged->server, xsurface);
if (!view || !view->scene_tree) {
if (!view || !view->scene_node) {
parent = &view->server->unmanaged_tree->node;
} else {
lx -= view->x;

View file

@ -258,7 +258,6 @@ map(struct view *view)
}
view->surface = view->xwayland_surface->surface;
view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node);
view->scene_node = wlr_scene_subsurface_tree_create(
&view->scene_tree->node, view->surface);
if (!view->scene_node) {
@ -376,6 +375,7 @@ xwayland_surface_new(struct wl_listener *listener, void *data)
view->impl = &xwl_view_impl;
view->xwayland_surface = xsurface;
view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node);
xsurface->data = view;
view->map.notify = handle_map;