diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-10-12 21:26:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 21:26:12 -0400 |
| commit | 15a67e57b07f7fe3b2fa69cae82f2a7e0cf00815 (patch) | |
| tree | 5f80bbe3775f0e405895ab973c62f8bbd8ea1bf8 /sway/layout.c | |
| parent | 857eea8b6355deff7a12edd8b733f8057210142a (diff) | |
| parent | 4cba91803eb8c3c3ab4ebf22e94510b43f7a907d (diff) | |
Merge pull request #954 from SirCmpwn/revert-945-workspace_layout
Revert "Fixes dealing with workspace_layout and related bugs [rfc]"
Diffstat (limited to 'sway/layout.c')
| -rw-r--r-- | sway/layout.c | 13 |
1 files changed, 1 insertions, 12 deletions
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) { |