aboutsummaryrefslogtreecommitdiff
path: root/sway/container.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/container.c')
-rw-r--r--sway/container.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/sway/container.c b/sway/container.c
index c3461acb..9d5e2690 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -27,7 +27,6 @@ static swayc_t *new_swayc(enum swayc_types type) {
c->handle = -1;
c->gaps = -1;
c->layout = L_NONE;
- c->workspace_layout = L_NONE;
c->type = type;
if (type != C_VIEW) {
c->children = create_list();
@@ -210,8 +209,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
swayc_t *workspace = new_swayc(C_WORKSPACE);
workspace->prev_layout = L_NONE;
- workspace->layout = L_HORIZ;
- workspace->workspace_layout = default_layout(output);
+ workspace->layout = default_layout(output);
workspace->x = output->x;
workspace->y = output->y;
@@ -264,7 +262,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
// add container to workspace chidren
add_child(workspace, cont);
// give them proper layouts
- cont->layout = workspace->workspace_layout;
+ cont->layout = workspace->layout;
cont->prev_layout = workspace->prev_layout;
/* TODO: might break shit in move_container!!! workspace->layout = layout; */
set_focused_container_for(workspace, get_focused_view(workspace));
@@ -931,12 +929,3 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) {
}
return NULL;
}
-
-swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
- if (container->type == C_WORKSPACE) {
- container->workspace_layout = layout;
- } else {
- container->layout = layout;
- }
- return container;
-}