summaryrefslogtreecommitdiff
path: root/sway/tree/container.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2018-09-16 10:22:01 -0400
committerGitHub <[email protected]>2018-09-16 10:22:01 -0400
commit456b91600d73edb3187c170eb6720b1c3212351c (patch)
tree318401a7a3c0e8f778d45e4ea26f5517e05191fa /sway/tree/container.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/tree/container.c')
-rw-r--r--sway/tree/container.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index f906449a..47687744 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -220,7 +220,7 @@ static struct sway_container *container_at_tabbed(struct sway_node *parent,
}
// Surfaces
- struct sway_node *current = seat_get_active_child(seat, parent);
+ struct sway_node *current = seat_get_active_tiling_child(seat, parent);
return current ? tiling_container_at(current, lx, ly, surface, sx, sy) : NULL;
}
@@ -248,7 +248,7 @@ static struct sway_container *container_at_stacked(struct sway_node *parent,
}
// Surfaces
- struct sway_node *current = seat_get_active_child(seat, parent);
+ struct sway_node *current = seat_get_active_tiling_child(seat, parent);
return current ? tiling_container_at(current, lx, ly, surface, sx, sy) : NULL;
}