diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-08-01 16:03:37 +0100 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-08-06 14:17:58 +0100 |
commit | 356063b6c084a7c2d4e3e654fe48ec79a102294b (patch) | |
tree | 7e780aa0fb2feb1156e96ce61744122fad32c4d4 /sway/tree | |
parent | commands: better type for con_id string length (diff) | |
download | sway-356063b6c084a7c2d4e3e654fe48ec79a102294b.tar.gz sway-356063b6c084a7c2d4e3e654fe48ec79a102294b.tar.zst sway-356063b6c084a7c2d4e3e654fe48ec79a102294b.zip |
commands: fix layout implementation (also better name for previous split layout)
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/layout.c | 4 | ||||
-rw-r--r-- | sway/tree/workspace.c | 2 |
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, | |||
859 | } | 859 | } |
860 | if (child->type == C_WORKSPACE && child->children->length == 0) { | 860 | if (child->type == C_WORKSPACE && child->children->length == 0) { |
861 | // Special case: this just behaves like splitt | 861 | // Special case: this just behaves like splitt |
862 | child->prev_layout = child->layout; | 862 | child->prev_split_layout = child->layout; |
863 | child->layout = layout; | 863 | child->layout = layout; |
864 | return child; | 864 | return child; |
865 | } | 865 | } |
@@ -870,7 +870,7 @@ struct sway_container *container_split(struct sway_container *child, | |||
870 | 870 | ||
871 | remove_gaps(child); | 871 | remove_gaps(child); |
872 | 872 | ||
873 | cont->prev_layout = L_NONE; | 873 | cont->prev_split_layout = L_NONE; |
874 | cont->width = child->width; | 874 | cont->width = child->width; |
875 | cont->height = child->height; | 875 | cont->height = child->height; |
876 | cont->x = child->x; | 876 | 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, | |||
59 | workspace->width = output->width; | 59 | workspace->width = output->width; |
60 | workspace->height = output->height; | 60 | workspace->height = output->height; |
61 | workspace->name = !name ? NULL : strdup(name); | 61 | workspace->name = !name ? NULL : strdup(name); |
62 | workspace->prev_layout = L_NONE; | 62 | workspace->prev_split_layout = L_NONE; |
63 | workspace->layout = container_get_default_layout(output); | 63 | workspace->layout = container_get_default_layout(output); |
64 | 64 | ||
65 | struct sway_workspace *swayws = calloc(1, sizeof(struct sway_workspace)); | 65 | struct sway_workspace *swayws = calloc(1, sizeof(struct sway_workspace)); |