aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorIan Fan <ianfan0@gmail.com>2018-08-01 16:03:37 +0100
committerIan Fan <ianfan0@gmail.com>2018-08-06 14:17:58 +0100
commit356063b6c084a7c2d4e3e654fe48ec79a102294b (patch)
tree7e780aa0fb2feb1156e96ce61744122fad32c4d4 /sway/tree
parent3a980857cba80719e70ee3960b5b3b12923fda81 (diff)
commands: fix layout implementation (also better name for previous split layout)
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/layout.c4
-rw-r--r--sway/tree/workspace.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 07de9664..28cdc71e 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -859,7 +859,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;
}
@@ -870,7 +870,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;
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index cc225e79..250d5ba7 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -59,7 +59,7 @@ struct sway_container *workspace_create(struct sway_container *output,
workspace->width = output->width;
workspace->height = output->height;
workspace->name = !name ? NULL : strdup(name);
- workspace->prev_layout = L_NONE;
+ workspace->prev_split_layout = L_NONE;
workspace->layout = container_get_default_layout(output);
struct sway_workspace *swayws = calloc(1, sizeof(struct sway_workspace));