chase wlroots: wlr_xdg_surface_get_geometry remove MR 4788

Ref: 5c98d1a04a1439bf40c6e516086cfaff2d67f135
("xdg-surface: fix window geometry handling")
This commit is contained in:
Consolatis 2024-11-27 04:14:08 +01:00 committed by Johan Malm
parent 261126fcd0
commit 1dc4e7ed28
4 changed files with 9 additions and 15 deletions

View file

@ -463,10 +463,9 @@ process_cursor_motion_out_of_surface(struct server *server,
ly = view->current.y;
/* Take into account invisible xdg-shell CSD borders */
if (view->type == LAB_XDG_SHELL_VIEW) {
struct wlr_box geo;
wlr_xdg_surface_get_geometry(xdg_surface_from_view(view), &geo);
lx -= geo.x;
ly -= geo.y;
struct wlr_xdg_surface *xdg_surface = xdg_surface_from_view(view);
lx -= xdg_surface->geometry.x;
ly -= xdg_surface->geometry.y;
}
} else if (node && wlr_layer_surface_v1_try_from_wlr_surface(surface)) {
wlr_scene_node_coords(node, &lx, &ly);

View file

@ -230,10 +230,8 @@ update_popup_position(struct input_method_popup *popup)
if (xdg_surface) {
/* Take into account invisible xdg-shell CSD borders */
struct wlr_box geo;
wlr_xdg_surface_get_geometry(xdg_surface, &geo);
cursor_rect.x -= geo.x;
cursor_rect.y -= geo.y;
cursor_rect.x -= xdg_surface->geometry.x;
cursor_rect.y -= xdg_surface->geometry.y;
}
} else {
cursor_rect = (struct wlr_box){0};