From b4a75a1ab2a72842830aeea37733311f85e6f660 Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Wed, 1 Jul 2020 03:20:38 -0400 Subject: commands/move: maintain workspace_layout when moving Fixes #5157. --- sway/tree/container.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sway/tree/container.c') diff --git a/sway/tree/container.c b/sway/tree/container.c index 4cc42747..fa1598ef 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1329,6 +1329,14 @@ 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. + if (!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); } -- cgit v1.2.3