Merge pull request #2858 from RyanDwyer/fix-move-to-floating-ws

Fix moving tiled containers to workspaces which only have floating views
This commit is contained in:
Drew DeVault 2018-10-17 16:16:12 +02:00 committed by GitHub
commit 10d07478ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -483,7 +483,8 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) {
ws = workspace_create(NULL, ws_name); ws = workspace_create(NULL, ws_name);
} }
free(ws_name); free(ws_name);
destination = seat_get_focus_inactive(seat, &ws->node); struct sway_container *dst = seat_get_focus_inactive_tiling(seat, ws);
destination = dst ? &dst->node : &ws->node;
} else if (strcasecmp(argv[1], "output") == 0) { } else if (strcasecmp(argv[1], "output") == 0) {
struct sway_output *new_output = output_in_direction(argv[2], struct sway_output *new_output = output_in_direction(argv[2],
old_output, container->x, container->y); old_output, container->x, container->y);