aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop/transaction.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-09-16 10:22:01 -0400
committerGitHub <noreply@github.com>2018-09-16 10:22:01 -0400
commit456b91600d73edb3187c170eb6720b1c3212351c (patch)
tree318401a7a3c0e8f778d45e4ea26f5517e05191fa /sway/desktop/transaction.c
parent5192f74be132a563e30b240415b385e67cbacadb (diff)
parentf6e218a64371b02afdf6b7812a52d70b13635ef3 (diff)
Merge pull request #2637 from RyanDwyer/fix-tabbed-workspace-shenanigans
Make seat_get_active_child ignore floating children
Diffstat (limited to 'sway/desktop/transaction.c')
-rw-r--r--sway/desktop/transaction.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index b4eec933..d747e279 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -176,7 +176,8 @@ static void copy_container_state(struct sway_container *container,
state->focused = seat_get_focus(seat) == &container->node;
if (!container->view) {
- struct sway_node *focus = seat_get_active_child(seat, &container->node);
+ struct sway_node *focus =
+ seat_get_active_tiling_child(seat, &container->node);
state->focused_inactive_child = focus ? focus->sway_container : NULL;
}
}