aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-10-26 03:20:17 +0200
committerLibravatar GitHub <noreply@github.com>2018-10-26 03:20:17 +0200
commitb29beb1aa05431c5166afd4ef8d90c753fd9570a (patch)
treecd6096df32aee49e0e4e7706f7d222105cd2f2a7
parentMerge pull request #2984 from Ferdi265/master (diff)
parentFix re-tiling for floating containers (diff)
downloadsway-b29beb1aa05431c5166afd4ef8d90c753fd9570a.tar.gz
sway-b29beb1aa05431c5166afd4ef8d90c753fd9570a.tar.zst
sway-b29beb1aa05431c5166afd4ef8d90c753fd9570a.zip
Merge pull request #2985 from mihaicmn/fix-retiling
Fix re-tiling for floating containers
-rw-r--r--sway/tree/container.c5
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 {