From b4ab8182b7f3f9c2c0ac0c28719f6f71808a36d8 Mon Sep 17 00:00:00 2001 From: Alexander Orzechowski Date: Wed, 10 Jul 2024 12:20:53 -0400 Subject: [PATCH] transaction: Reparent all container children when disabling for scratchpad Fixes: #8205 (cherry picked from commit b881c2e84c4be3c7b996f85200cfe391a7979267) --- sway/desktop/transaction.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index 7568990b..2ee5a5df 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -632,6 +632,15 @@ static void arrange_root(struct sway_root *root) { for (int i = 0; i < root->scratchpad->length; i++) { struct sway_container *con = root->scratchpad->items[i]; + // When a container is moved to a scratchpad, it's possible that it + // was moved into a floating container as part of the same transaction. + // In this case, we need to make sure we reparent all the container's + // children so that disabling the container will disable all descendants. + if (!con->view) for (int ii = 0; ii < con->current.children->length; ii++) { + struct sway_container *child = con->current.children->items[ii]; + wlr_scene_node_reparent(&child->scene_tree->node, con->content_tree); + } + wlr_scene_node_set_enabled(&con->scene_tree->node, false); }