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

container: fix surface_is_popup()

Browse source
This commit is contained in:
Kirill Primak 2021-11-13 09:08:14 +03:00 committed by Simon Ser
parent bb7bb3676d
commit cbecc5cbae
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sway/tree/container.c
View file

@ -382,19 +382,17 @@ struct sway_container *tiling_container_at(struct sway_node *parent,
} }
static bool surface_is_popup(struct wlr_surface *surface) { static bool surface_is_popup(struct wlr_surface *surface) {
if (wlr_surface_is_xdg_surface(surface)) { while (!wlr_surface_is_xdg_surface(surface)) {
struct wlr_xdg_surface *xdg_surface = if (!wlr_surface_is_subsurface(surface)) {
wlr_xdg_surface_from_wlr_surface(surface); return false;
while (xdg_surface && xdg_surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
return true;
}
xdg_surface = xdg_surface->toplevel->parent;
} }
return false; struct wlr_subsurface *subsurface =
wlr_subsurface_from_wlr_surface(surface);
surface = subsurface->parent;
} }
struct wlr_xdg_surface *xdg_surface =
return false; wlr_xdg_surface_from_wlr_surface(surface);
return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
} }
struct sway_container *container_at(struct sway_workspace *workspace, struct sway_container *container_at(struct sway_workspace *workspace,