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

Remove wlr_xdg_surface_send_close.

Browse source
This commit is contained in:
Connor E 2019-01-14 17:53:33 +00:00 committed by emersion
parent a68bc5f449
commit 023c92423e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/desktop/xdg_shell.c
View file

@ -231,8 +231,9 @@ static void _close(struct sway_view *view) {
return; return;
} }
struct wlr_xdg_surface *surface = view->wlr_xdg_surface; struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) { if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL
wlr_xdg_surface_send_close(surface); && surface->toplevel) {
wlr_xdg_toplevel_send_close(surface);
} }
} }
@ -240,7 +241,10 @@ static void close_popups_iterator(struct wlr_surface *surface,
int sx, int sy, void *data) { int sx, int sy, void *data) {
struct wlr_xdg_surface *xdg_surface = struct wlr_xdg_surface *xdg_surface =
wlr_xdg_surface_from_wlr_surface(surface); wlr_xdg_surface_from_wlr_surface(surface);
wlr_xdg_surface_send_close(xdg_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) {