mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-08 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove sway_container.workspace_layout

Browse source 
Fixes #1716.
This commit is contained in:
Ryan Dwyer 2018-04-26 10:14:18 +10:00
parent 7ac770f3c0
commit ae39d7b28c
7 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sway/commands/layout.c
View file

@ -26,9 +26,9 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
// TODO: stacks and tabs
if (strcasecmp(argv[0], "default") == 0) {
container_set_layout(parent, parent->prev_layout);
parent->layout = parent->prev_layout;
if (parent->layout == L_NONE) {
container_set_layout(parent, container_get_default_layout(parent));
parent->layout = container_get_default_layout(parent);
}
} else {
if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
@ -36,15 +36,14 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
}
if (strcasecmp(argv[0], "splith") == 0) {
container_set_layout(parent, L_HORIZ);
parent->layout = L_HORIZ;
} else if (strcasecmp(argv[0], "splitv") == 0) {
container_set_layout(parent, L_VERT);
parent->layout = L_VERT;
} else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE
|| parent->workspace_layout == L_HORIZ)) {
container_set_layout(parent, L_VERT);
if (parent->layout == L_HORIZ) {
parent->layout = L_VERT;
} else {
container_set_layout(parent, L_HORIZ);
parent->layout = L_HORIZ;
}
}
}