3 files changed, 31 insertions, 18 deletions

diff --git a/include/container.h b/include/container.h
index d9f33b8a..29d4ea12 100644
--- a/include/container.h
+++ b/include/container.h
@@ -56,6 +56,7 @@ struct sway_container {
 
         enum swayc_types type;
         enum swayc_layouts layout;
+        enum swayc_layouts prev_layout;
 
         /**
          * Width and height of this container, without borders or gaps.
diff --git a/sway/commands.c b/sway/commands.c
index ce1fe8a3..ad5416f7 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1760,29 +1760,38 @@ static struct cmd_results *cmd_layout(int argc, char **argv) {
         }
 
         if (strcasecmp(argv[0], "default") == 0) {
-                swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT);
-                parent->layout = default_layout(output);
-        } else if (strcasecmp(argv[0], "tabbed") == 0) {
-                if (parent->type != C_CONTAINER) {
-                        parent = new_container(parent, L_TABBED);
+                parent->layout = parent->prev_layout;
+                if (parent->layout == L_NONE) {
+                        swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT);
+                        parent->layout = default_layout(output);
                 }
-
-                parent->layout = L_TABBED;
-        } else if (strcasecmp(argv[0], "stacking") == 0) {
-                if (parent->type != C_CONTAINER) {
-                        parent = new_container(parent, L_STACKED);
+        } else {
+                if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
+                        parent->prev_layout = parent->layout;
                 }
 
-                parent->layout = L_STACKED;
-        } else if (strcasecmp(argv[0], "splith") == 0) {
-                parent->layout = L_HORIZ;
-        } else if (strcasecmp(argv[0], "splitv") == 0) {
-                parent->layout = L_VERT;
-        } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
-                if (parent->layout == L_VERT) {
+                if (strcasecmp(argv[0], "tabbed") == 0) {
+                        if (parent->type != C_CONTAINER) {
+                                parent = new_container(parent, L_TABBED);
+                        }
+
+                        parent->layout = L_TABBED;
+                } else if (strcasecmp(argv[0], "stacking") == 0) {
+                        if (parent->type != C_CONTAINER) {
+                                parent = new_container(parent, L_STACKED);
+                        }
+
+                        parent->layout = L_STACKED;
+                } else if (strcasecmp(argv[0], "splith") == 0) {
                         parent->layout = L_HORIZ;
-                } else {
+                } else if (strcasecmp(argv[0], "splitv") == 0) {
                         parent->layout = L_VERT;
+                } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
+                        if (parent->layout == L_VERT) {
+                                parent->layout = L_HORIZ;
+                        } else {
+                                parent->layout = L_VERT;
+                        }
                 }
         }
 
diff --git a/sway/container.c b/sway/container.c
index 5579fddb..42f6a69a 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -163,6 +163,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
         sway_log(L_DEBUG, "Added workspace %s for output %u", name, (unsigned int)output->handle);
         swayc_t *workspace = new_swayc(C_WORKSPACE);
 
+        workspace->prev_layout = L_NONE;
         workspace->layout = default_layout(output);
 
         workspace->x = output->x;
@@ -203,6 +204,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
 
         sway_log(L_DEBUG, "creating container %p around %p", cont, child);
 
+        cont->prev_layout = L_NONE;
         cont->layout = layout;
         cont->width = child->width;
         cont->height = child->height;
@@ -229,6 +231,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
                 add_child(workspace, cont);
                 // give them proper layouts
                 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));
         } else { // Or is built around container