aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-08-02 08:11:23 -0400
committerLibravatar GitHub <noreply@github.com>2018-08-02 08:11:23 -0400
commit8e60f6a73263c444ab5fecdeacdaf7883a9b1505 (patch)
treee6731aeedc2bd3f0e8c89d4d311c6088c627a47c
parentMerge pull request #2403 from RyanDwyer/fix-transaction-unmap (diff)
parentAllow moving containers when workspace itself is focused (diff)
downloadsway-8e60f6a73263c444ab5fecdeacdaf7883a9b1505.tar.gz
sway-8e60f6a73263c444ab5fecdeacdaf7883a9b1505.tar.zst
sway-8e60f6a73263c444ab5fecdeacdaf7883a9b1505.zip
Merge pull request #2404 from RyanDwyer/move-containers-when-workspace-focused
Allow moving containers when workspace itself is focused
-rw-r--r--sway/commands/move.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 46ebcd83..702b42d9 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -59,8 +59,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
59 && strcasecmp(argv[2], "workspace") == 0) { 59 && strcasecmp(argv[2], "workspace") == 0) {
60 // move container to workspace x 60 // move container to workspace x
61 if (current->type == C_WORKSPACE) { 61 if (current->type == C_WORKSPACE) {
62 // TODO: Wrap children in a container and move that 62 current = container_wrap_children(current);
63 return cmd_results_new(CMD_FAILURE, "move", "Unimplemented");
64 } else if (current->type != C_CONTAINER && current->type != C_VIEW) { 63 } else if (current->type != C_CONTAINER && current->type != C_VIEW) {
65 return cmd_results_new(CMD_FAILURE, "move", 64 return cmd_results_new(CMD_FAILURE, "move",
66 "Can only move containers and views."); 65 "Can only move containers and views.");