diff options
| author | Kirill Primak <vyivel@eclair.cafe> | 2022-05-27 16:37:35 +0300 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-05-27 15:42:22 +0200 |
| commit | 26a0e97634dc641337fbb25cc193f26177265d14 (patch) | |
| tree | 1b4504c1b6fe89531d8b9480a71fbf3ebeded313 | |
| parent | d0b9bf94a5c6e88b13c6fa7f9b41af0a94ea1a3e (diff) | |
chore: chase wlroots xdg-shell update
| -rw-r--r-- | sway/desktop/layer_shell.c | 8 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 159f3336..d44d6338 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -484,15 +484,15 @@ static struct sway_layer_surface *popup_get_layer( static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) { struct wlr_xdg_popup *popup = layer_popup->wlr_popup; struct wlr_surface *surface = popup->base->surface; - int popup_sx = popup->geometry.x - popup->base->current.geometry.x; - int popup_sy = popup->geometry.y - popup->base->current.geometry.y; + int popup_sx = popup->current.geometry.x - popup->base->current.geometry.x; + int popup_sy = popup->current.geometry.y - popup->base->current.geometry.y; int ox = popup_sx, oy = popup_sy; struct sway_layer_surface *layer; while (true) { if (layer_popup->parent_type == LAYER_PARENT_POPUP) { layer_popup = layer_popup->parent_popup; - ox += layer_popup->wlr_popup->geometry.x; - oy += layer_popup->wlr_popup->geometry.y; + ox += layer_popup->wlr_popup->current.geometry.x; + oy += layer_popup->wlr_popup->current.geometry.y; } else { layer = layer_popup->parent_layer; ox += layer->geo.x; diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 51168f4c..16121733 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -27,8 +27,8 @@ static void popup_get_view_coords(struct sway_view_child *child, struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup; wlr_xdg_popup_get_toplevel_coords(wlr_popup, - wlr_popup->geometry.x - wlr_popup->base->current.geometry.x, - wlr_popup->geometry.y - wlr_popup->base->current.geometry.y, + wlr_popup->current.geometry.x - wlr_popup->base->current.geometry.x, + wlr_popup->current.geometry.y - wlr_popup->base->current.geometry.y, sx, sy); } |