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 | Handle NULL output make/model/serial (diff) | |
download | sway-26a0e97634dc641337fbb25cc193f26177265d14.tar.gz sway-26a0e97634dc641337fbb25cc193f26177265d14.tar.zst sway-26a0e97634dc641337fbb25cc193f26177265d14.zip |
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( | |||
484 | static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) { | 484 | static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) { |
485 | struct wlr_xdg_popup *popup = layer_popup->wlr_popup; | 485 | struct wlr_xdg_popup *popup = layer_popup->wlr_popup; |
486 | struct wlr_surface *surface = popup->base->surface; | 486 | struct wlr_surface *surface = popup->base->surface; |
487 | int popup_sx = popup->geometry.x - popup->base->current.geometry.x; | 487 | int popup_sx = popup->current.geometry.x - popup->base->current.geometry.x; |
488 | int popup_sy = popup->geometry.y - popup->base->current.geometry.y; | 488 | int popup_sy = popup->current.geometry.y - popup->base->current.geometry.y; |
489 | int ox = popup_sx, oy = popup_sy; | 489 | int ox = popup_sx, oy = popup_sy; |
490 | struct sway_layer_surface *layer; | 490 | struct sway_layer_surface *layer; |
491 | while (true) { | 491 | while (true) { |
492 | if (layer_popup->parent_type == LAYER_PARENT_POPUP) { | 492 | if (layer_popup->parent_type == LAYER_PARENT_POPUP) { |
493 | layer_popup = layer_popup->parent_popup; | 493 | layer_popup = layer_popup->parent_popup; |
494 | ox += layer_popup->wlr_popup->geometry.x; | 494 | ox += layer_popup->wlr_popup->current.geometry.x; |
495 | oy += layer_popup->wlr_popup->geometry.y; | 495 | oy += layer_popup->wlr_popup->current.geometry.y; |
496 | } else { | 496 | } else { |
497 | layer = layer_popup->parent_layer; | 497 | layer = layer_popup->parent_layer; |
498 | ox += layer->geo.x; | 498 | 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, | |||
27 | struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup; | 27 | struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup; |
28 | 28 | ||
29 | wlr_xdg_popup_get_toplevel_coords(wlr_popup, | 29 | wlr_xdg_popup_get_toplevel_coords(wlr_popup, |
30 | wlr_popup->geometry.x - wlr_popup->base->current.geometry.x, | 30 | wlr_popup->current.geometry.x - wlr_popup->base->current.geometry.x, |
31 | wlr_popup->geometry.y - wlr_popup->base->current.geometry.y, | 31 | wlr_popup->current.geometry.y - wlr_popup->base->current.geometry.y, |
32 | sx, sy); | 32 | sx, sy); |
33 | } | 33 | } |
34 | 34 | ||