sway

commit c969923aba29797c8ae6f7a7fe0a298a2f7c52f9
parent f611a4f9b10ee3e5c8115c3bd89e9fda51ade104
Author: emersion <contact@emersion.fr>
Date:   Mon,  2 Jul 2018 13:10:00 +0100

Merge pull request #2193 from RyanDwyer/fix-fullscreen-damage

Fix damage on swaybar when view requests to exit fullscreen
Diffstat:
M
sway/desktop/xdg_shell.c
 | 
4
++--
M
sway/desktop/xdg_shell_v6.c
 | 
4
++--
M
sway/desktop/xwayland.c
 | 
4
++--

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
@@ -222,8 +222,8 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) 
 
 	view_set_fullscreen(view, e->fullscreen);
 
-	struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
-	arrange_and_commit(ws);
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+	arrange_and_commit(output);
 }
 
 static void handle_unmap(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
@@ -217,8 +217,8 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) 
 
 	view_set_fullscreen(view, e->fullscreen);
 
-	struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
-	arrange_and_commit(ws);
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+	arrange_and_commit(output);
 }
 
 static void handle_unmap(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
@@ -379,8 +379,8 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) 
 	}
 	view_set_fullscreen(view, xsurface->fullscreen);
 
-	struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
-	arrange_and_commit(ws);
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+	arrange_and_commit(output);
 }
 
 static void handle_set_title(struct wl_listener *listener, void *data) {