Merge branch 'master' into commands

This commit is contained in:
Ryan Dwyer 2018-08-25 13:06:04 +10:00 committed by GitHub
commit 4b9ad9c238
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 326 additions and 336 deletions

View file

@ -247,7 +247,7 @@ static void workspace_move_to_output(struct sway_container *workspace,
}
// Try to remove an empty workspace from the destination output.
container_reap_empty_recursive(new_output_focus);
container_reap_empty(new_output_focus);
output_sort_workspaces(output);
seat_set_focus(seat, output);