mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-02-05 04:06:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update scene node when an unmanaged window moves

Browse source 
A null check had to be added because, since a view's scene isn't created
until .map, there's a possibility that .set_geometry is called before
the scene node exists.
This commit is contained in:
Devin J. Pohly 2023-10-16 16:55:17 -05:00
parent 2f4801aea0
commit 31c129b218
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
view.c
View file

@ -94,7 +94,11 @@ view_position(struct cg_view *view)
/* We shouldn't position override-redirect windows. They set
their own (x,y) coordinates in handle_xwayland_surface_set_geometry. */
if (view->type == CAGE_XWAYLAND_VIEW && !xwayland_view_should_manage(view)) {
wlr_scene_node_set_position(&view->scene_tree->node, view->lx, view->ly);
/* The scene is created in .map, but .set_geometry can come
* before that. */
if (view->scene_tree != NULL) {
wlr_scene_node_set_position(&view->scene_tree->node, view->lx, view->ly);
}
} else
#endif
if (view_is_primary(view) || view_extends_output_layout(view, &layout_box)) {
@ -119,6 +123,7 @@ view_unmap(struct cg_view *view)
wl_list_remove(&view->link);
wlr_scene_node_destroy(&view->scene_tree->node);
view->scene_tree = NULL;
view->wlr_surface->data = NULL;
view->wlr_surface = NULL;

1
xwayland.c
View file

@ -112,6 +112,7 @@ handle_xwayland_surface_set_geometry(struct wl_listener *listener, void *data)
if (!xwayland_view_should_manage(view)) {
view->lx = xwayland_view->xwayland_surface->x;
view->ly = xwayland_view->xwayland_surface->y;
view_position(view);
}
}