aboutsummaryrefslogtreecommitdiff
path: root/sway/layout.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2015-10-28 15:54:28 -0400
committerDrew DeVault <sir@cmpwn.com>2015-10-28 15:54:28 -0400
commit239f4bd0ba9e849a7041cfed2dcc16e1a484b5cc (patch)
treeb35493c3ef4b83f8ef4b344ad7e0683e58200654 /sway/layout.c
parentfa9978ee848a9387a3c3f7eb1017f91f5f77f032 (diff)
parent5fa8f91655ccc0346a360e95a72237eb772c7e18 (diff)
Merge pull request #210 from sce/focus_output
commands: Learn 'focus output <direction|name>'
Diffstat (limited to 'sway/layout.c')
-rw-r--r--sway/layout.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/layout.c b/sway/layout.c
index 6388a9b2..29772172 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -289,15 +289,16 @@ void move_container_to(swayc_t* container, swayc_t* destination) {
return;
}
swayc_t *parent = remove_child(container);
- // reset container geometry
- container->width = container->height = 0;
-
// Send to new destination
if (container->is_floating) {
add_floating(swayc_active_workspace_for(destination), container);
} else if (destination->type == C_WORKSPACE) {
+ // reset container geometry
+ container->width = container->height = 0;
add_child(destination, container);
} else {
+ // reset container geometry
+ container->width = container->height = 0;
add_sibling(destination, container);
}
// Destroy old container if we need to