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

Revert "Fixes dealing with workspace_layout and related bugs [rfc]"

Browse source
This commit is contained in:
Drew DeVault 2016-10-12 21:26:06 -04:00 • committed by GitHub
parent 857eea8b63
commit 4cba91803e
7 changed files with 26 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sway/commands/layout.c
View file

@ -22,10 +22,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
enum swayc_layouts old_layout = parent->layout;
if (strcasecmp(argv[0], "default") == 0) {
swayc_change_layout(parent, parent->prev_layout);
parent->layout = parent->prev_layout;
if (parent->layout == L_NONE) {
swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT);
swayc_change_layout(parent, default_layout(output));
parent->layout = default_layout(output);
}
} else {
if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
@ -37,22 +37,22 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
parent = new_container(parent, L_TABBED);
}
swayc_change_layout(parent, L_TABBED);
parent->layout = L_TABBED;
} else if (strcasecmp(argv[0], "stacking") == 0) {
if (parent->type != C_CONTAINER && !swayc_is_empty_workspace(parent)) {
parent = new_container(parent, L_STACKED);
}
swayc_change_layout(parent, L_STACKED);
parent->layout = L_STACKED;
} else if (strcasecmp(argv[0], "splith") == 0) {
swayc_change_layout(parent, L_HORIZ);
parent->layout = L_HORIZ;
} else if (strcasecmp(argv[0], "splitv") == 0) {
swayc_change_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_VERT) {
swayc_change_layout(parent, L_HORIZ);
parent->layout = L_HORIZ;
} else {
swayc_change_layout(parent, L_VERT);
parent->layout = L_VERT;
}
}
}

4
sway/commands/move.c
View file

@ -37,7 +37,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
if (!view->children || view->children->length == 0) {
return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace");
}
view = new_container(view, view->workspace_layout);
view = new_container(view, view->layout);
} if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
}
@ -65,7 +65,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
if (!view->children || view->children->length == 0) {
return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace");
}
view = new_container(view, view->workspace_layout);
view = new_container(view, view->layout);
} else if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
} else if (!(output = output_by_name(argv[3], &abs_pos))) {

4
sway/commands/split.c
View file

@ -25,11 +25,11 @@ static struct cmd_results *_do_split(int argc, char **argv, int layout) {
/* Case that focus is on an workspace with 0/1 children.change its layout */
if (focused->type == C_WORKSPACE && focused->children->length <= 1) {
sway_log(L_DEBUG, "changing workspace layout");
swayc_change_layout(focused, layout);
focused->layout = layout;
} else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) {
/* Case of no siblings. change parent layout */
sway_log(L_DEBUG, "changing container layout");
swayc_change_layout(focused->parent, layout);
focused->parent->layout = layout;
} else {
/* regular case where new split container is build around focused container
* or in case of workspace, container inherits its children */