diff options
| author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-04-02 16:29:31 +0200 |
|---|---|---|
| committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-04-25 00:00:49 +0200 |
| commit | e226b20bd8d2ce98077aee35b2a33b73943db247 (patch) | |
| tree | 6f6d9c1c9743a2cb3d4a0ab013e312bba63d471d /sway | |
| parent | a0cebb7c5a0530414e85c85fb0231881f988df7c (diff) | |
| download | sway-e226b20bd8d2ce98077aee35b2a33b73943db247.tar.xz | |
Reapply prev layout when exiting tabbed/stacked
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands.c | 45 | ||||
| -rw-r--r-- | sway/container.c | 3 |
2 files changed, 30 insertions, 18 deletions
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 |