From 4cba91803eb8c3c3ab4ebf22e94510b43f7a907d Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 12 Oct 2016 21:26:06 -0400 Subject: Revert "Fixes dealing with workspace_layout and related bugs [rfc]" --- sway/layout.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'sway/layout.c') diff --git a/sway/layout.c b/sway/layout.c index 8565113d..4f2ea09a 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -66,11 +66,6 @@ void add_child(swayc_t *parent, swayc_t *child) { if (!parent->focused) { parent->focused = child; } - - // wrap view into a container - if (parent->type == C_WORKSPACE && child->type == C_VIEW) { - new_container(child, parent->workspace_layout); - } } void insert_child(swayc_t *parent, swayc_t *child, int index) { @@ -85,11 +80,6 @@ void insert_child(swayc_t *parent, swayc_t *child, int index) { if (!parent->focused) { parent->focused = child; } - - // wrap view into a container - if (parent->type == C_WORKSPACE && child->type == C_VIEW) { - new_container(child, parent->workspace_layout); - } } void add_floating(swayc_t *ws, swayc_t *child) { @@ -312,8 +302,7 @@ void move_container(swayc_t *container, enum movement_direction dir) { } // Change parent layout if we need to if (parent->children->length == 1 && parent->layout != layout) { - swayc_change_layout(parent, layout); - /* parent->layout = layout; */ + parent->layout = layout; continue; } if (parent->type == C_WORKSPACE) { -- cgit v1.2.3