mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-19 14:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix close_popups for xdg-shell

Browse source 
wlr_xdg_popup_destroy will destroy popups, so we need to walk the tree
carefully. It's enough to just destroy all direct children, since destroying
the parent will also destroy all children.
This commit is contained in:
emersion 2019-02-05 19:07:01 +01:00 committed by Drew DeVault
parent d4e49a49eb
commit 48511c3b35
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sway/desktop/xdg_shell.c
View file

@ -236,19 +236,11 @@ static void _close(struct sway_view *view) {
} }
} }
static void close_popups_iterator(struct wlr_surface *surface,
int sx, int sy, void *data) {
struct wlr_xdg_surface *xdg_surface =
wlr_xdg_surface_from_wlr_surface(surface);
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP
&& xdg_surface->popup) {
wlr_xdg_popup_destroy(xdg_surface);
}
}
static void close_popups(struct sway_view *view) { static void close_popups(struct sway_view *view) {
wlr_xdg_surface_for_each_popup(view->wlr_xdg_surface, struct wlr_xdg_popup *popup, *tmp;
close_popups_iterator, NULL); wl_list_for_each_safe(popup, tmp, &view->wlr_xdg_surface->popups, link) {
wlr_xdg_popup_destroy(popup->base);
}
} }
static void destroy(struct sway_view *view) { static void destroy(struct sway_view *view) {