diff options
author | 2018-07-02 21:58:21 +1000 | |
---|---|---|
committer | 2018-07-02 21:58:21 +1000 | |
commit | d467452e5e06bb4f9aaf98ba92f9696770b188ed (patch) | |
tree | 5354fc4bc00f426f3f9487242cf6203d9ad45e57 /sway | |
parent | Merge pull request #2187 from martinetd/idle-inhibit (diff) | |
download | sway-d467452e5e06bb4f9aaf98ba92f9696770b188ed.tar.gz sway-d467452e5e06bb4f9aaf98ba92f9696770b188ed.tar.zst sway-d467452e5e06bb4f9aaf98ba92f9696770b188ed.zip |
Fix damage on swaybar when view requests to exit fullscreen
Fixes #2191
Diffstat (limited to 'sway')
-rw-r--r-- | sway/desktop/xdg_shell.c | 4 | ||||
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 4 | ||||
-rw-r--r-- | 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 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) | |||
222 | 222 | ||
223 | view_set_fullscreen(view, e->fullscreen); | 223 | view_set_fullscreen(view, e->fullscreen); |
224 | 224 | ||
225 | struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); | 225 | struct sway_container *output = container_parent(view->swayc, C_OUTPUT); |
226 | arrange_and_commit(ws); | 226 | arrange_and_commit(output); |
227 | } | 227 | } |
228 | 228 | ||
229 | static void handle_unmap(struct wl_listener *listener, void *data) { | 229 | 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) | |||
217 | 217 | ||
218 | view_set_fullscreen(view, e->fullscreen); | 218 | view_set_fullscreen(view, e->fullscreen); |
219 | 219 | ||
220 | struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); | 220 | struct sway_container *output = container_parent(view->swayc, C_OUTPUT); |
221 | arrange_and_commit(ws); | 221 | arrange_and_commit(output); |
222 | } | 222 | } |
223 | 223 | ||
224 | static void handle_unmap(struct wl_listener *listener, void *data) { | 224 | 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) | |||
379 | } | 379 | } |
380 | view_set_fullscreen(view, xsurface->fullscreen); | 380 | view_set_fullscreen(view, xsurface->fullscreen); |
381 | 381 | ||
382 | struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); | 382 | struct sway_container *output = container_parent(view->swayc, C_OUTPUT); |
383 | arrange_and_commit(ws); | 383 | arrange_and_commit(output); |
384 | } | 384 | } |
385 | 385 | ||
386 | static void handle_set_title(struct wl_listener *listener, void *data) { | 386 | static void handle_set_title(struct wl_listener *listener, void *data) { |