diff options
Diffstat (limited to 'sway/desktop/xdg_shell_v6.c')
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 7ff4c4de..5ac589cf 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -339,6 +339,18 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) return; } + if (e->fullscreen && e->output && e->output->data) { + struct sway_output *output = e->output->data; + struct sway_workspace *ws = output_get_active_workspace(output); + if (ws && !container_is_scratchpad_hidden(view->container)) { + if (container_is_floating(view->container)) { + workspace_add_floating(ws, view->container); + } else { + workspace_add_tiling(ws, view->container); + } + } + } + container_set_fullscreen(view->container, e->fullscreen); arrange_root(); @@ -411,7 +423,9 @@ static void handle_map(struct wl_listener *listener, void *data) { == WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; view_map(view, view->wlr_xdg_surface_v6->surface, - xdg_surface->toplevel->client_pending.fullscreen, csd); + xdg_surface->toplevel->client_pending.fullscreen, + xdg_surface->toplevel->client_pending.fullscreen_output, + csd); transaction_commit_dirty(); |