diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-10-12 21:26:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 21:26:12 -0400 |
commit | 15a67e57b07f7fe3b2fa69cae82f2a7e0cf00815 (patch) | |
tree | 5f80bbe3775f0e405895ab973c62f8bbd8ea1bf8 /sway/commands/move.c | |
parent | 857eea8b6355deff7a12edd8b733f8057210142a (diff) | |
parent | 4cba91803eb8c3c3ab4ebf22e94510b43f7a907d (diff) |
Merge pull request #954 from SirCmpwn/revert-945-workspace_layout
Revert "Fixes dealing with workspace_layout and related bugs [rfc]"
Diffstat (limited to 'sway/commands/move.c')
-rw-r--r-- | sway/commands/move.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 4819d9ef..48e9d562 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -37,7 +37,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { if (!view->children || view->children->length == 0) { return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); } - view = new_container(view, view->workspace_layout); + view = new_container(view, view->layout); } if (view->type != C_CONTAINER && view->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); } @@ -65,7 +65,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { if (!view->children || view->children->length == 0) { return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); } - view = new_container(view, view->workspace_layout); + view = new_container(view, view->layout); } else if (view->type != C_CONTAINER && view->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); } else if (!(output = output_by_name(argv[3], &abs_pos))) { |