mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: chase wlroots xdg-shell update

Browse source
This commit is contained in:
Kirill Primak 2022-05-27 16:37:35 +03:00 committed by Simon Ser
parent d0b9bf94a5
commit 26a0e97634
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/desktop/layer_shell.c
View file

@ -484,15 +484,15 @@ static struct sway_layer_surface *popup_get_layer(
static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) { static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) {
struct wlr_xdg_popup *popup = layer_popup->wlr_popup; struct wlr_xdg_popup *popup = layer_popup->wlr_popup;
struct wlr_surface *surface = popup->base->surface; struct wlr_surface *surface = popup->base->surface;
int popup_sx = popup->geometry.x - popup->base->current.geometry.x; int popup_sx = popup->current.geometry.x - popup->base->current.geometry.x;
int popup_sy = popup->geometry.y - popup->base->current.geometry.y; int popup_sy = popup->current.geometry.y - popup->base->current.geometry.y;
int ox = popup_sx, oy = popup_sy; int ox = popup_sx, oy = popup_sy;
struct sway_layer_surface *layer; struct sway_layer_surface *layer;
while (true) { while (true) {
if (layer_popup->parent_type == LAYER_PARENT_POPUP) { if (layer_popup->parent_type == LAYER_PARENT_POPUP) {
layer_popup = layer_popup->parent_popup; layer_popup = layer_popup->parent_popup;
ox += layer_popup->wlr_popup->geometry.x; ox += layer_popup->wlr_popup->current.geometry.x;
oy += layer_popup->wlr_popup->geometry.y; oy += layer_popup->wlr_popup->current.geometry.y;
} else { } else {
layer = layer_popup->parent_layer; layer = layer_popup->parent_layer;
ox += layer->geo.x; ox += layer->geo.x;

4
sway/desktop/xdg_shell.c
View file

@ -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; struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup;
wlr_xdg_popup_get_toplevel_coords(wlr_popup, wlr_xdg_popup_get_toplevel_coords(wlr_popup,
wlr_popup->geometry.x - wlr_popup->base->current.geometry.x, wlr_popup->current.geometry.x - wlr_popup->base->current.geometry.x,
wlr_popup->geometry.y - wlr_popup->base->current.geometry.y, wlr_popup->current.geometry.y - wlr_popup->base->current.geometry.y,
sx, sy); sx, sy);
} }