summaryrefslogtreecommitdiff
path: root/sway/tree/layout.c
diff options
context:
space:
mode:
authorBrian Ashworth <[email protected]>2018-08-06 11:47:00 -0400
committerGitHub <[email protected]>2018-08-06 11:47:00 -0400
commit639f3368e101b697aaf3715b1213ea30766ff4ed (patch)
tree67dfb7bc19eb3dd27252d8b0f493436250b4fdea /sway/tree/layout.c
parentf57a3919cf5ad7c3edbf9e2e19051971a5f2d42f (diff)
parentd8b65193c493e5826383a08593395a598ce4b503 (diff)
Merge branch 'master' into workspace-move-to-output
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r--sway/tree/layout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 9485e675..20815654 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -843,7 +843,7 @@ struct sway_container *container_split(struct sway_container *child,
}
if (child->type == C_WORKSPACE && child->children->length == 0) {
// Special case: this just behaves like splitt
- child->prev_layout = child->layout;
+ child->prev_split_layout = child->layout;
child->layout = layout;
return child;
}
@@ -854,7 +854,7 @@ struct sway_container *container_split(struct sway_container *child,
remove_gaps(child);
- cont->prev_layout = L_NONE;
+ cont->prev_split_layout = L_NONE;
cont->width = child->width;
cont->height = child->height;
cont->x = child->x;