alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "commands/move: maintain workspace_layout when moving"

Browse source 
This is in preparation for changing the workspace_layout
command to work like it does in i3.

This reverts commit b4a75a1ab2.
This commit is contained in:
Ronan Pigott 2020-11-02 12:09:45 -07:00 committed by Tudor Brindus
parent 971aa90ccc
commit b4850876dc
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/commands/move.c
View file

@ -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;
}

10
sway/tree/container.c
View file

@ -1355,16 +1355,6 @@ void container_detach(struct sway_container *child) {
container_update_representation(old_parent);
node_set_dirty(&old_parent->node);
} else if (old_workspace) {
// We may have removed the last tiling child from the workspace. If the
// workspace layout was e.g. tabbed, then at this point it may be just
// H[]. So, reset it to the default (e.g. T[]) for next time.
// But if we are evacuating a workspace with only sticky floating
// containers, the workspace will already be detached from the output.
if (old_workspace->output && !old_workspace->tiling->length) {
old_workspace->layout =
output_get_default_layout(old_workspace->output);
}
workspace_update_representation(old_workspace);
node_set_dirty(&old_workspace->node);
}