Merge pull request #2592 from RyanDwyer/fix-fullscreen-unmap-focus

Second attempt at restoring focus when closing a fullscreen view
This commit is contained in:
emersion 2018-09-06 14:59:01 +02:00 committed by GitHub
commit 4a3b705a12
Failed to generate hash of commit

View file

@ -84,6 +84,11 @@ void container_begin_destroy(struct sway_container *con) {
if (con->view) { if (con->view) {
ipc_event_window(con, "close"); ipc_event_window(con, "close");
} }
// The workspace must have the fullscreen pointer cleared so that the
// seat code can find an appropriate new focus.
if (con->is_fullscreen && con->workspace) {
con->workspace->fullscreen = NULL;
}
wl_signal_emit(&con->node.events.destroy, &con->node); wl_signal_emit(&con->node.events.destroy, &con->node);
container_end_mouse_operation(con); container_end_mouse_operation(con);