From b4850876dc609830575531fd6e0ca696c956ae94 Mon Sep 17 00:00:00 2001 From: Ronan Pigott Date: Mon, 2 Nov 2020 12:09:45 -0700 Subject: Revert "commands/move: maintain workspace_layout when moving" This is in preparation for changing the workspace_layout command to work like it does in i3. This reverts commit b4a75a1ab2a72842830aeea37733311f85e6f660. --- sway/commands/move.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'sway/commands') 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; } -- cgit v1.2.3