aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-10-08 23:39:35 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-10-08 23:39:35 +1000
commitb8002fc0c4c7e517665cb78ab206338f7f7560a7 (patch)
treee50eb1a123503d34156ec049e737e645eae5906c
parent88317b59ce1d8546ef52a897a226fe62b516d059 (diff)
downloadsway-b8002fc0c4c7e517665cb78ab206338f7f7560a7.zip
sway-b8002fc0c4c7e517665cb78ab206338f7f7560a7.tar.gz
sway-b8002fc0c4c7e517665cb78ab206338f7f7560a7.tar.bz2
Look for any ancestor when checking for fullscreen exit
-rw-r--r--sway/desktop/xdg_shell.c9
-rw-r--r--sway/desktop/xdg_shell_v6.c9
-rw-r--r--sway/desktop/xwayland.c9
3 files changed, 12 insertions, 15 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 5483167..5b53653 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -404,12 +404,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 &&
xdg_surface->toplevel->parent) {
- struct wlr_xdg_surface *psurface = xdg_surface->toplevel->parent;
- struct sway_xdg_shell_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);
}
}
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index dacfca0..ac42cfe 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -399,12 +399,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 &&
xdg_surface->toplevel->parent) {
- struct wlr_xdg_surface_v6 *psurface = xdg_surface->toplevel->parent;
- struct sway_xdg_shell_v6_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);
}
}
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 80489f9..2bdb7dc 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);
}
}