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

chase wlroots: wlr_xdg_surface_get_geometry remove MR 4788

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
src/input/cursor.c
View file

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

6
src/input/ime.c
View file

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

9
src/xdg.c
View file

@ -149,8 +149,7 @@ handle_commit(struct wl_listener *listener, void *data)
return; return;
} }
struct wlr_box size; struct wlr_box size = xdg_surface->geometry;
wlr_xdg_surface_get_geometry(xdg_surface, &size);
bool update_required = false; bool update_required = false;
/* /*
@ -727,10 +726,8 @@ xdg_toplevel_view_map(struct view *view)
* dimensions remain zero until handle_commit(). * dimensions remain zero until handle_commit().
*/ */
if (wlr_box_empty(&view->pending)) { if (wlr_box_empty(&view->pending)) {
struct wlr_box size; view->pending.width = xdg_surface->geometry.width;
wlr_xdg_surface_get_geometry(xdg_surface, &size); view->pending.height = xdg_surface->geometry.height;
view->pending.width = size.width;
view->pending.height = size.height;
} }
/* /*

2
subprojects/wlroots.wrap
View file

@ -1,6 +1,6 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = 1133bc15ceb2c2bcb6df692acda6bfa39a292ab5 revision = 5c98d1a04a1439bf40c6e516086cfaff2d67f135
[provide] [provide]
dependency_names = wlroots-0.19 dependency_names = wlroots-0.19