aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/layout.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <RedSoxFan@users.noreply.github.com>2018-08-06 11:47:00 -0400
committerLibravatar GitHub <noreply@github.com>2018-08-06 11:47:00 -0400
commit639f3368e101b697aaf3715b1213ea30766ff4ed (patch)
tree67dfb7bc19eb3dd27252d8b0f493436250b4fdea /sway/tree/layout.c
parentMove workspace moving code out of container_move_to (diff)
parentMerge pull request #2268 from emersion/server-decoration-borders (diff)
downloadsway-639f3368e101b697aaf3715b1213ea30766ff4ed.tar.gz
sway-639f3368e101b697aaf3715b1213ea30766ff4ed.tar.zst
sway-639f3368e101b697aaf3715b1213ea30766ff4ed.zip
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,
843 } 843 }
844 if (child->type == C_WORKSPACE && child->children->length == 0) { 844 if (child->type == C_WORKSPACE && child->children->length == 0) {
845 // Special case: this just behaves like splitt 845 // Special case: this just behaves like splitt
846 child->prev_layout = child->layout; 846 child->prev_split_layout = child->layout;
847 child->layout = layout; 847 child->layout = layout;
848 return child; 848 return child;
849 } 849 }
@@ -854,7 +854,7 @@ struct sway_container *container_split(struct sway_container *child,
854 854
855 remove_gaps(child); 855 remove_gaps(child);
856 856
857 cont->prev_layout = L_NONE; 857 cont->prev_split_layout = L_NONE;
858 cont->width = child->width; 858 cont->width = child->width;
859 cont->height = child->height; 859 cont->height = child->height;
860 cont->x = child->x; 860 cont->x = child->x;