From 59babac69d35284a39865243a7e067604abeeaec Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 7 Oct 2016 16:37:02 -0400 Subject: Merge pull request #938 from alkino/fix_sibling Fix creating of sibling floating/children --- sway/layout.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sway/layout.c b/sway/layout.c index 3629df24..4f2ea09a 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -99,11 +99,20 @@ void add_floating(swayc_t *ws, swayc_t *child) { swayc_t *add_sibling(swayc_t *fixed, swayc_t *active) { swayc_t *parent = fixed->parent; - int i = index_child(fixed); if (fixed->is_floating) { - list_insert(parent->floating, i + 1, active); + if (active->is_floating) { + int i = index_child(fixed); + list_insert(parent->floating, i + 1, active); + } else { + list_add(parent->children, active); + } } else { - list_insert(parent->children, i + 1, active); + if (active->is_floating) { + list_add(parent->floating, active); + } else { + int i = index_child(fixed); + list_insert(parent->children, i + 1, active); + } } active->parent = parent; // focus new child -- cgit v1.2.3-54-g00ecf