diff options
author | Mihai Coman <mihai.cmn@gmail.com> | 2018-10-25 23:20:38 +0300 |
---|---|---|
committer | Mihai Coman <mihai.cmn@gmail.com> | 2018-10-25 23:20:38 +0300 |
commit | 5323551a7f425bfbb2d8239a04137b50e7a3d43d (patch) | |
tree | ef136bf47847c2fbf8407efbff0cfe5c466f425f | |
parent | Merge pull request #2982 from Toromtomtom/master (diff) | |
download | sway-5323551a7f425bfbb2d8239a04137b50e7a3d43d.tar.gz sway-5323551a7f425bfbb2d8239a04137b50e7a3d43d.tar.zst sway-5323551a7f425bfbb2d8239a04137b50e7a3d43d.zip |
Fix re-tiling for floating containers
When a floating container is tiled (e.g.: 'floating toggle' or
'floating disable'), it should be placed after/below the inactive
focused container from the tiling layout.
-rw-r--r-- | sway/tree/container.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 58d3df34..8ab6ebf8 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -676,11 +676,8 @@ void container_set_floating(struct sway_container *container, bool enable) { | |||
676 | container_detach(container); | 676 | container_detach(container); |
677 | struct sway_container *reference = | 677 | struct sway_container *reference = |
678 | seat_get_focus_inactive_tiling(seat, workspace); | 678 | seat_get_focus_inactive_tiling(seat, workspace); |
679 | if (reference && reference->view) { | ||
680 | reference = reference->parent; | ||
681 | } | ||
682 | if (reference) { | 679 | if (reference) { |
683 | container_add_child(reference, container); | 680 | container_add_sibling(reference, container, 1); |
684 | container->width = reference->width; | 681 | container->width = reference->width; |
685 | container->height = reference->height; | 682 | container->height = reference->height; |
686 | } else { | 683 | } else { |