summaryrefslogtreecommitdiff
path: root/sway/commands/move.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2017-04-06 06:47:26 -0400
committerGitHub <[email protected]>2017-04-06 06:47:26 -0400
commit3f40b6132187b0535eb038ce799052fdbcdaafc7 (patch)
treeb883a5553107ab24d5346db42062518f9e7bdca9 /sway/commands/move.c
parent7d43a76b4e765eb8072c09cdec3847e877cf65d7 (diff)
parent069d37f987c4e323cdb9396f0d80ac83d00566ff (diff)
Merge pull request #1149 from 4e554c4c/criteria
Improve criteria handling
Diffstat (limited to 'sway/commands/move.c')
-rw-r--r--sway/commands/move.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 97e10f10..3c47cfe7 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -20,7 +20,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
"'move <container|window> to workspace <name>' or "
"'move <container|window|workspace> to output <name|direction>' or "
"'move position mouse'";
- swayc_t *view = get_focused_container(&root_container);
+ swayc_t *view = current_container;
if (argc == 2 || (argc == 3 && strcasecmp(argv[2], "px") == 0 )) {
char *inv;
@@ -125,7 +125,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move scratchpad", "Can only move containers and views.");
}
- swayc_t *view = get_focused_container(&root_container);
+ swayc_t *view = current_container;
int i;
for (i = 0; i < scratchpad->length; i++) {
if (scratchpad->items[i] == view) {