diff options
author | emersion <contact@emersion.fr> | 2018-09-06 14:59:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-06 14:59:01 +0200 |
commit | 4a3b705a12ad791ff93392716febd11e46ecffd5 (patch) | |
tree | fe5acdd42e4a8d4ac7b17cfbd09d52a7f8e7dcee | |
parent | Merge pull request #2591 from RyanDwyer/fix-workspace-switch (diff) | |
parent | Second attempt at restoring focus when closing a fullscreen view (diff) | |
download | sway-4a3b705a12ad791ff93392716febd11e46ecffd5.tar.gz sway-4a3b705a12ad791ff93392716febd11e46ecffd5.tar.zst sway-4a3b705a12ad791ff93392716febd11e46ecffd5.zip |
Merge pull request #2592 from RyanDwyer/fix-fullscreen-unmap-focus
Second attempt at restoring focus when closing a fullscreen view
-rw-r--r-- | sway/tree/container.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 50f284f4..cbbb1f56 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -84,6 +84,11 @@ void container_begin_destroy(struct sway_container *con) { | |||
84 | if (con->view) { | 84 | if (con->view) { |
85 | ipc_event_window(con, "close"); | 85 | ipc_event_window(con, "close"); |
86 | } | 86 | } |
87 | // The workspace must have the fullscreen pointer cleared so that the | ||
88 | // seat code can find an appropriate new focus. | ||
89 | if (con->is_fullscreen && con->workspace) { | ||
90 | con->workspace->fullscreen = NULL; | ||
91 | } | ||
87 | wl_signal_emit(&con->node.events.destroy, &con->node); | 92 | wl_signal_emit(&con->node.events.destroy, &con->node); |
88 | 93 | ||
89 | container_end_mouse_operation(con); | 94 | container_end_mouse_operation(con); |