diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-17 16:16:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-17 16:16:12 +0200 |
commit | 10d07478ad95336ad0bf40d53c60bbaf85fd2c4d (patch) | |
tree | 0abc8539d6040daaae4271ad59baf85f1f32e158 /sway/commands | |
parent | Merge pull request #2864 from sghctoma/freebsd-fixes (diff) | |
parent | Fix moving tiled containers to workspaces which only have floating views (diff) | |
download | sway-10d07478ad95336ad0bf40d53c60bbaf85fd2c4d.tar.gz sway-10d07478ad95336ad0bf40d53c60bbaf85fd2c4d.tar.zst sway-10d07478ad95336ad0bf40d53c60bbaf85fd2c4d.zip |
Merge pull request #2858 from RyanDwyer/fix-move-to-floating-ws
Fix moving tiled containers to workspaces which only have floating views
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/move.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 24036f36..cb7f6009 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -483,7 +483,8 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { | |||
483 | ws = workspace_create(NULL, ws_name); | 483 | ws = workspace_create(NULL, ws_name); |
484 | } | 484 | } |
485 | free(ws_name); | 485 | free(ws_name); |
486 | destination = seat_get_focus_inactive(seat, &ws->node); | 486 | struct sway_container *dst = seat_get_focus_inactive_tiling(seat, ws); |
487 | destination = dst ? &dst->node : &ws->node; | ||
487 | } else if (strcasecmp(argv[1], "output") == 0) { | 488 | } else if (strcasecmp(argv[1], "output") == 0) { |
488 | struct sway_output *new_output = output_in_direction(argv[2], | 489 | struct sway_output *new_output = output_in_direction(argv[2], |
489 | old_output, container->x, container->y); | 490 | old_output, container->x, container->y); |