diff options
author | 2018-07-27 09:10:10 +1000 | |
---|---|---|
committer | 2018-07-28 22:41:04 +1000 | |
commit | 538e083f61c363ef1127636d8fac1b7e4872e4c4 (patch) | |
tree | 7bb7c11bb066ba0e3277ee16068c14bd0409d43c /sway/tree/container.c | |
parent | Allow splitting a floating view (diff) | |
download | sway-538e083f61c363ef1127636d8fac1b7e4872e4c4.tar.gz sway-538e083f61c363ef1127636d8fac1b7e4872e4c4.tar.zst sway-538e083f61c363ef1127636d8fac1b7e4872e4c4.zip |
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/container.c')
-rw-r--r-- | sway/tree/container.c | 2 |
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) { | |||
1033 | struct sway_container *sibling = | 1033 | struct sway_container *sibling = |
1034 | seat_get_focus_inactive_tiling(seat, workspace); | 1034 | seat_get_focus_inactive_tiling(seat, workspace); |
1035 | container_remove_child(container); | 1035 | container_remove_child(container); |
1036 | container_add_child(sibling, container); | 1036 | container_add_sibling(sibling, container); |
1037 | container->width = container->parent->width; | 1037 | container->width = container->parent->width; |
1038 | container->height = container->parent->height; | 1038 | container->height = container->parent->height; |
1039 | if (container->type == C_VIEW) { | 1039 | if (container->type == C_VIEW) { |