diff options
author | Brian Ashworth <[email protected]> | 2019-04-24 20:28:19 -0400 |
---|---|---|
committer | Drew DeVault <[email protected]> | 2019-04-24 19:12:24 -0600 |
commit | 462ad4ea8380f29ad7a81d65bc144cb0ac6f5d8f (patch) | |
tree | 7d83afea78abc6b9e754b05e156ab25b22dce972 /sway/tree/container.c | |
parent | dc7a3930a7ffd4435c9215c7cce0afa37d06c91f (diff) |
cmd_move: respect workspace layout when inserting
When moving a container to become a direct child of the workspace and
the workspace's layout is tabbed or stacked, wrap it in a container
with the same layout. This allows for the following:
- Run `layout tabbed|stacked` on an empty workspace (or use
`workspace_layout tabbed|stacked` in the config)
- Open some views
- Move one of the views in any direction
- Open another view
- The new container should also be `tabbed`/`stacked`
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 11ed4f98..c4d21f0a 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1385,8 +1385,10 @@ void container_replace(struct sway_container *container, root_scratchpad_show(container); root_scratchpad_remove_container(container); } - container_add_sibling(container, replacement, 1); - container_detach(container); + if (container->parent || container->workspace) { + container_add_sibling(container, replacement, 1); + container_detach(container); + } if (scratchpad) { root_scratchpad_add_container(replacement); } |