aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-07-02 13:10:00 +0100
committerGitHub <noreply@github.com>2018-07-02 13:10:00 +0100
commitc969923aba29797c8ae6f7a7fe0a298a2f7c52f9 (patch)
tree5354fc4bc00f426f3f9487242cf6203d9ad45e57 /sway/desktop
parentf611a4f9b10ee3e5c8115c3bd89e9fda51ade104 (diff)
parentd467452e5e06bb4f9aaf98ba92f9696770b188ed (diff)
Merge pull request #2193 from RyanDwyer/fix-fullscreen-damage
Fix damage on swaybar when view requests to exit fullscreen
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/xdg_shell.c4
-rw-r--r--sway/desktop/xdg_shell_v6.c4
-rw-r--r--sway/desktop/xwayland.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 82db4076..2b634749 100644
--- 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
index 0d3c1644..2f0730e4 100644
--- 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
index 4bb35f60..71803262 100644
--- 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) {