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

Merge 14ba8d3365 into dcd64ae48b

Browse source
This commit is contained in:
Devin J. Pohly 2026-01-11 00:09:59 +03:00 • committed by GitHub
commit ab7e34b81a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
view.c
View file

@ -96,6 +96,17 @@ view_position(struct cg_view *view)
struct wlr_box layout_box;
wlr_output_layout_get_box(view->server->output_layout, NULL, &layout_box);
#if CAGE_HAS_XWAYLAND
/* 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)) {
/* 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)) {
view_maximize(view, &layout_box);
} else {
@ -123,6 +134,7 @@ view_unmap(struct cg_view *view)
view->foreign_toplevel_handle = NULL;
wlr_scene_node_destroy(&view->scene_tree->node);
view->scene_tree = NULL;
view->wlr_surface->data = NULL;
view->wlr_surface = NULL;
@ -155,14 +167,7 @@ view_map(struct cg_view *view, struct wlr_surface *surface)
view->wlr_surface = surface;
surface->data = view;
#if CAGE_HAS_XWAYLAND
/* We shouldn't position override-redirect windows. They set
their own (x,y) coordinates in handle_wayland_surface_map. */
if (view->type != CAGE_XWAYLAND_VIEW || xwayland_view_should_manage(view))
#endif
{
view_position(view);
}
view_position(view);
wl_list_insert(&view->server->views, &view->link);