alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use wlr_xdg_popup_get_toplevel_coords

Browse source
This commit is contained in:
Ryan Dwyer 2018-10-06 17:29:23 +10:00
parent 1059e173f4
commit 59ba528bd9
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/desktop/xdg_shell.c
View file

@ -24,13 +24,11 @@ static void popup_get_root_coords(struct sway_view_child *child,
int *root_sx, int *root_sy) { int *root_sx, int *root_sy) {
struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child; struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child;
struct wlr_xdg_surface *surface = popup->wlr_xdg_surface; struct wlr_xdg_surface *surface = popup->wlr_xdg_surface;
*root_sx = -surface->geometry.x;
*root_sy = -surface->geometry.y; wlr_xdg_popup_get_toplevel_coords(surface->popup,
while (surface && surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { -surface->geometry.x + surface->popup->geometry.x,
*root_sx += surface->popup->geometry.x; -surface->geometry.y + surface->popup->geometry.y,
*root_sy += surface->popup->geometry.y; root_sx, root_sy);
surface = wlr_xdg_surface_from_wlr_surface(surface->popup->parent);
}
} }
static void popup_destroy(struct sway_view_child *child) { static void popup_destroy(struct sway_view_child *child) {

12
sway/desktop/xdg_shell_v6.c
View file

@ -23,13 +23,11 @@ static void popup_get_root_coords(struct sway_view_child *child,
int *root_sx, int *root_sy) { int *root_sx, int *root_sy) {
struct sway_xdg_popup_v6 *popup = (struct sway_xdg_popup_v6 *)child; struct sway_xdg_popup_v6 *popup = (struct sway_xdg_popup_v6 *)child;
struct wlr_xdg_surface_v6 *surface = popup->wlr_xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = popup->wlr_xdg_surface_v6;
*root_sx = -surface->geometry.x;
*root_sy = -surface->geometry.y; wlr_xdg_popup_v6_get_toplevel_coords(surface->popup,
while (surface && surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) { -surface->geometry.x + surface->popup->geometry.x,
*root_sx += surface->popup->geometry.x; -surface->geometry.y + surface->popup->geometry.y,
*root_sy += surface->popup->geometry.y; root_sx, root_sy);
surface = surface->popup->parent;
}
} }
static void popup_destroy(struct sway_view_child *child) { static void popup_destroy(struct sway_view_child *child) {