aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/move.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/move.c')
-rw-r--r--sway/commands/move.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 247c45fe..32adf0bf 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -276,11 +276,12 @@ static void workspace_rejigger(struct sway_workspace *ws,
return;
}
container_detach(child);
- workspace_wrap_children(ws);
+ struct sway_container *new_parent = workspace_wrap_children(ws);
int index =
move_dir == WLR_DIRECTION_LEFT || move_dir == WLR_DIRECTION_UP ? 0 : 1;
workspace_insert_tiling(ws, child, index);
+ container_flatten(new_parent);
ws->layout =
move_dir == WLR_DIRECTION_LEFT || move_dir == WLR_DIRECTION_RIGHT ?
L_HORIZ : L_VERT;
@@ -340,11 +341,8 @@ static bool container_move_in_direction(struct sway_container *container,
container_insert_child(current->parent, container,
index + (offs < 0 ? 0 : 1));
} else {
- struct sway_workspace *ws = current->workspace;
- workspace_insert_tiling(ws,
- container_split(container,
- output_get_default_layout(ws->output)),
- index + (offs < 0 ? 0 : 1));
+ workspace_insert_tiling(current->workspace, container,
+ index + (offs < 0 ? 0 : 1));
}
return true;
}