mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-18 06:46:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert to *_try_from_wlr_surface()

Browse source 
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3991
This commit is contained in:
Simon Ser 2023-02-01 20:24:40 +01:00 • committed by Kirill Primak
parent b31e97e55d
commit 9959e6b8dc
5 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/tree/container.c
View file

@ -387,16 +387,16 @@ struct sway_container *tiling_container_at(struct sway_node *parent,
}
static bool surface_is_popup(struct wlr_surface *surface) {
while (!wlr_surface_is_xdg_surface(surface)) {
if (!wlr_surface_is_subsurface(surface)) {
while (wlr_xdg_surface_try_from_wlr_surface(surface) == NULL) {
struct wlr_subsurface *subsurface =
wlr_subsurface_try_from_wlr_surface(surface);
if (subsurface == NULL) {
return false;
}
struct wlr_subsurface *subsurface =
wlr_subsurface_from_wlr_surface(surface);
surface = subsurface->parent;
}
struct wlr_xdg_surface *xdg_surface =
wlr_xdg_surface_from_wlr_surface(surface);
wlr_xdg_surface_try_from_wlr_surface(surface);
return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
}