1
1
mirror of https://github.com/swaywm/sway synced 2024-11-23 00:51:58 +01:00

transaction: Reparent all container children when disabling for scratchpad

Fixes: #8205
This commit is contained in:
Alexander Orzechowski 2024-07-10 12:20:53 -04:00 committed by Simon Ser
parent 6e4ccb99c3
commit b881c2e84c

@ -632,6 +632,15 @@ static void arrange_root(struct sway_root *root) {
for (int i = 0; i < root->scratchpad->length; i++) { for (int i = 0; i < root->scratchpad->length; i++) {
struct sway_container *con = root->scratchpad->items[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); wlr_scene_node_set_enabled(&con->scene_tree->node, false);
} }