From 571321a1d84a1eb2867fbdc39f7f828aa2c64a01 Mon Sep 17 00:00:00 2001 From: "D.B" Date: Mon, 10 Oct 2016 20:44:09 +0200 Subject: add workspace_layout, ensure ws is always L_HORIZ Add swayc_change_layout function, which changes either layout or workspace_layout, depending on the container type. Workspace being always L_HORIZ makes this much more i3-compatible. --- sway/commands/layout.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sway/commands/layout.c') diff --git a/sway/commands/layout.c b/sway/commands/layout.c index e0af30aa..a716f9be 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -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) { - parent->layout = parent->prev_layout; + swayc_change_layout(parent, parent->prev_layout); if (parent->layout == L_NONE) { swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT); - parent->layout = default_layout(output); + swayc_change_layout(parent, 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); } - parent->layout = L_TABBED; + swayc_change_layout(parent, 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); } - parent->layout = L_STACKED; + swayc_change_layout(parent, L_STACKED); } else if (strcasecmp(argv[0], "splith") == 0) { - parent->layout = L_HORIZ; + swayc_change_layout(parent, L_HORIZ); } else if (strcasecmp(argv[0], "splitv") == 0) { - parent->layout = L_VERT; + swayc_change_layout(parent, 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; + swayc_change_layout(parent, L_HORIZ); } else { - parent->layout = L_VERT; + swayc_change_layout(parent, L_VERT); } } } -- cgit v1.2.3