aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-07-27 09:10:10 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-07-28 22:41:04 +1000
commit538e083f61c363ef1127636d8fac1b7e4872e4c4 (patch)
tree7bb7c11bb066ba0e3277ee16068c14bd0409d43c /sway/tree
parentc95847c9e17cf42a8ff23f791232c0ddd671ba6e (diff)
Fix focus mode_toggle from a child of a floating container
Also fixes a crash when unfloating a window. It needs to add it back to the tiling tree as a sibling rather than a child, because the reference container might be a view.
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/container.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index b8ff87e1..71babe5c 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1033,7 +1033,7 @@ void container_set_floating(struct sway_container *container, bool enable) {
struct sway_container *sibling =
seat_get_focus_inactive_tiling(seat, workspace);
container_remove_child(container);
- container_add_child(sibling, container);
+ container_add_sibling(sibling, container);
container->width = container->parent->width;
container->height = container->parent->height;
if (container->type == C_VIEW) {