diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-26 11:38:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:38:52 +0200 |
| commit | d94bb78ff3ade39cc848d0acfd571b9ac6917868 (patch) | |
| tree | a61a0fb433462d42b48a23fb58dd3b2a3bc778d8 /sway/tree | |
| parent | 7ac770f3c0d4aa4b38650ad5ec7d1f5b7e70028a (diff) | |
| parent | ae39d7b28caa30652c0e48fda453f509e8e8d784 (diff) | |
Merge pull request #1863 from RyanDwyer/remove-workspace-layout
Remove sway_container.workspace_layout
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 1 | ||||
| -rw-r--r-- | sway/tree/layout.c | 23 | ||||
| -rw-r--r-- | sway/tree/workspace.c | 1 |
3 files changed, 5 insertions, 20 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index bd9f9894..09a6b7ce 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -78,7 +78,6 @@ struct sway_container *container_create(enum sway_container_type type) { } c->id = next_id++; c->layout = L_NONE; - c->workspace_layout = L_NONE; c->type = type; c->alpha = 1.0f; diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 12af7172..a64cc9a9 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -33,19 +33,6 @@ static void output_layout_handle_change(struct wl_listener *listener, arrange_windows(&root_container, layout_box->width, layout_box->height); } -struct sway_container *container_set_layout(struct sway_container *container, - enum sway_container_layout layout) { - if (container->type == C_WORKSPACE) { - container->workspace_layout = layout; - if (layout == L_HORIZ || layout == L_VERT) { - container->layout = layout; - } - } else { - container->layout = layout; - } - return container; -} - void layout_init(void) { root_container.id = 0; // normally assigned in new_swayc() root_container.type = C_ROOT; @@ -305,8 +292,8 @@ static void workspace_rejigger(struct sway_container *ws, int index = move_offs(move_dir); container_insert_child(ws, child, index < 0 ? 0 : 1); - container_set_layout(ws, - move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT); + ws->layout = + move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; container_flatten(ws); container_reap_empty_recursive(original_parent); @@ -387,9 +374,9 @@ void container_move(struct sway_container *container, workspace_rejigger(current, container, move_dir); } else if (current->children->length == 2) { wlr_log(L_DEBUG, "Changing workspace layout"); - container_set_layout(current, + current->layout = move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? - L_HORIZ : L_VERT); + L_HORIZ : L_VERT; container_insert_child(current, container, offs < 0 ? 0 : 1); arrange_windows(current, -1, -1); } @@ -1066,7 +1053,7 @@ struct sway_container *container_split(struct sway_container *child, container_add_child(workspace, cont); enum sway_container_layout old_layout = workspace->layout; - container_set_layout(workspace, layout); + workspace->layout = layout; cont->layout = old_layout; if (set_focus) { diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 7f3c1903..66e1f7b9 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -57,7 +57,6 @@ struct sway_container *workspace_create(struct sway_container *output, workspace->name = !name ? NULL : strdup(name); workspace->prev_layout = L_NONE; workspace->layout = container_get_default_layout(output); - workspace->workspace_layout = workspace->layout; struct sway_workspace *swayws = calloc(1, sizeof(struct sway_workspace)); if (!swayws) { |