From 3f6dc0fbe10cd567ab04215da28c95db0fa212fe Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Sat, 18 Oct 2025 16:55:46 +0000 Subject: sway/commands/layout: fix flatten parent once Fixes: c63e5f6c3b82 ("sway/commands/layout: flatten parent once") --- sway/commands/layout.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sway/commands/layout.c b/sway/commands/layout.c index a32c908b..22dfdf3d 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -137,11 +137,15 @@ struct cmd_results *cmd_layout(int argc, char **argv) { // If parent has only a singe child operate on its parent and // flatten once, like i3 if (container && container->pending.children->length == 1) { - struct sway_container *child = container->pending.children->items[0]; + // Also check grandparent to avoid restricting layouts struct sway_container *parent = container->pending.parent; - container_replace(container, child); - container_begin_destroy(container); - container = parent; + if (parent && parent->pending.children->length == 1) { + struct sway_container *child = container->pending.children->items[0]; + struct sway_container *parent = container->pending.parent; + container_replace(container, child); + container_begin_destroy(container); + container = parent; + } } } -- cgit v1.2.3