From b8002fc0c4c7e517665cb78ab206338f7f7560a7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 8 Oct 2018 23:39:35 +1000 Subject: Look for any ancestor when checking for fullscreen exit --- sway/desktop/xwayland.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sway/desktop/xwayland.c') diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 80489f93..2bdb7dc0 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -410,12 +410,11 @@ static void handle_map(struct wl_listener *listener, void *data) { if (config->popup_during_fullscreen == POPUP_LEAVE && view->container->workspace && view->container->workspace->fullscreen && + view->container->workspace->fullscreen->view && xsurface->parent) { - struct wlr_xwayland_surface *psurface = xsurface->parent; - struct sway_xwayland_view *parent = psurface->data; - struct sway_view *sway_view = &parent->view; - if (sway_view->container && sway_view->container->is_fullscreen) { - container_set_fullscreen(sway_view->container, false); + struct sway_container *fs = view->container->workspace->fullscreen; + if (is_transient_for(view, fs->view)) { + container_set_fullscreen(fs, false); } } -- cgit v1.2.3