diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-10-12 21:26:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 21:26:06 -0400 |
commit | 4cba91803eb8c3c3ab4ebf22e94510b43f7a907d (patch) | |
tree | 5f80bbe3775f0e405895ab973c62f8bbd8ea1bf8 /sway/layout.c | |
parent | Merge pull request #952 from SirCmpwn/revert-948-floating-titlebar-click (diff) | |
download | sway-4cba91803eb8c3c3ab4ebf22e94510b43f7a907d.tar.gz sway-4cba91803eb8c3c3ab4ebf22e94510b43f7a907d.tar.zst sway-4cba91803eb8c3c3ab4ebf22e94510b43f7a907d.zip |
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) { | |||
66 | if (!parent->focused) { | 66 | if (!parent->focused) { |
67 | parent->focused = child; | 67 | parent->focused = child; |
68 | } | 68 | } |
69 | |||
70 | // wrap view into a container | ||
71 | if (parent->type == C_WORKSPACE && child->type == C_VIEW) { | ||
72 | new_container(child, parent->workspace_layout); | ||
73 | } | ||
74 | } | 69 | } |
75 | 70 | ||
76 | void insert_child(swayc_t *parent, swayc_t *child, int index) { | 71 | 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) { | |||
85 | if (!parent->focused) { | 80 | if (!parent->focused) { |
86 | parent->focused = child; | 81 | parent->focused = child; |
87 | } | 82 | } |
88 | |||
89 | // wrap view into a container | ||
90 | if (parent->type == C_WORKSPACE && child->type == C_VIEW) { | ||
91 | new_container(child, parent->workspace_layout); | ||
92 | } | ||
93 | } | 83 | } |
94 | 84 | ||
95 | void add_floating(swayc_t *ws, swayc_t *child) { | 85 | void add_floating(swayc_t *ws, swayc_t *child) { |
@@ -312,8 +302,7 @@ void move_container(swayc_t *container, enum movement_direction dir) { | |||
312 | } | 302 | } |
313 | // Change parent layout if we need to | 303 | // Change parent layout if we need to |
314 | if (parent->children->length == 1 && parent->layout != layout) { | 304 | if (parent->children->length == 1 && parent->layout != layout) { |
315 | swayc_change_layout(parent, layout); | 305 | parent->layout = layout; |
316 | /* parent->layout = layout; */ | ||
317 | continue; | 306 | continue; |
318 | } | 307 | } |
319 | if (parent->type == C_WORKSPACE) { | 308 | if (parent->type == C_WORKSPACE) { |