mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Reapply prev layout when exiting tabbed/stacked

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2016-04-02 16:29:31 +02:00
parent a0cebb7c5a
commit e226b20bd8
3 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/container.h
View file

@ -56,6 +56,7 @@ struct sway_container {
enum swayc_types type; enum swayc_types type;
enum swayc_layouts layout; enum swayc_layouts layout;
enum swayc_layouts prev_layout;
/** /**
* Width and height of this container, without borders or gaps. * Width and height of this container, without borders or gaps.

45
sway/commands.c
View file

@ -1760,29 +1760,38 @@ static struct cmd_results *cmd_layout(int argc, char **argv) {
} }
if (strcasecmp(argv[0], "default") == 0) { if (strcasecmp(argv[0], "default") == 0) {
swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT); parent->layout = parent->prev_layout;
parent->layout = default_layout(output); if (parent->layout == L_NONE) {
} else if (strcasecmp(argv[0], "tabbed") == 0) { swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT);
if (parent->type != C_CONTAINER) { parent->layout = default_layout(output);
parent = new_container(parent, L_TABBED); }
} else {
if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
parent->prev_layout = parent->layout;
} }
parent->layout = L_TABBED; if (strcasecmp(argv[0], "tabbed") == 0) {
} else if (strcasecmp(argv[0], "stacking") == 0) { if (parent->type != C_CONTAINER) {
if (parent->type != C_CONTAINER) { parent = new_container(parent, L_TABBED);
parent = new_container(parent, L_STACKED); }
}
parent->layout = L_STACKED; parent->layout = L_TABBED;
} else if (strcasecmp(argv[0], "splith") == 0) { } else if (strcasecmp(argv[0], "stacking") == 0) {
parent->layout = L_HORIZ; if (parent->type != C_CONTAINER) {
} else if (strcasecmp(argv[0], "splitv") == 0) { parent = new_container(parent, L_STACKED);
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_STACKED;
} else if (strcasecmp(argv[0], "splith") == 0) {
parent->layout = L_HORIZ; parent->layout = L_HORIZ;
} else { } else if (strcasecmp(argv[0], "splitv") == 0) {
parent->layout = L_VERT; 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;
}
} }
} }

3
sway/container.c
View file

@ -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); sway_log(L_DEBUG, "Added workspace %s for output %u", name, (unsigned int)output->handle);
swayc_t *workspace = new_swayc(C_WORKSPACE); swayc_t *workspace = new_swayc(C_WORKSPACE);
workspace->prev_layout = L_NONE;
workspace->layout = default_layout(output); workspace->layout = default_layout(output);
workspace->x = output->x; 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); sway_log(L_DEBUG, "creating container %p around %p", cont, child);
cont->prev_layout = L_NONE;
cont->layout = layout; cont->layout = layout;
cont->width = child->width; cont->width = child->width;
cont->height = child->height; cont->height = child->height;
@ -229,6 +231,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
add_child(workspace, cont); add_child(workspace, cont);
// give them proper layouts // give them proper layouts
cont->layout = workspace->layout; cont->layout = workspace->layout;
cont->prev_layout = workspace->prev_layout;
/* TODO: might break shit in move_container!!! workspace->layout = layout; */ /* TODO: might break shit in move_container!!! workspace->layout = layout; */
set_focused_container_for(workspace, get_focused_view(workspace)); set_focused_container_for(workspace, get_focused_view(workspace));
} else { // Or is built around container } else { // Or is built around container