Merge pull request #2404 from RyanDwyer/move-containers-when-workspace-focused

Allow moving containers when workspace itself is focused
This commit is contained in:
Drew DeVault 2018-08-02 08:11:23 -04:00 committed by GitHub
commit 8e60f6a732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -59,8 +59,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
&& strcasecmp(argv[2], "workspace") == 0) { && strcasecmp(argv[2], "workspace") == 0) {
// move container to workspace x // move container to workspace x
if (current->type == C_WORKSPACE) { if (current->type == C_WORKSPACE) {
// TODO: Wrap children in a container and move that current = container_wrap_children(current);
return cmd_results_new(CMD_FAILURE, "move", "Unimplemented");
} else if (current->type != C_CONTAINER && current->type != C_VIEW) { } else if (current->type != C_CONTAINER && current->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", return cmd_results_new(CMD_FAILURE, "move",
"Can only move containers and views."); "Can only move containers and views.");