diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-04-03 13:16:23 -0400 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-03 13:16:23 -0400 |
commit | 065887bb7b25c1cf7d39459c79387a24e600085f (patch) | |
tree | 7958aed61c6c3c47fc3849434ad09dcbd6b53f65 | |
parent | make container_finish private (diff) | |
download | sway-065887bb7b25c1cf7d39459c79387a24e600085f.tar.gz sway-065887bb7b25c1cf7d39459c79387a24e600085f.tar.zst sway-065887bb7b25c1cf7d39459c79387a24e600085f.zip |
move container_set_layout to layout.h
-rw-r--r-- | include/sway/tree/container.h | 4 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 5 | ||||
-rw-r--r-- | sway/tree/container.c | 13 | ||||
-rw-r--r-- | sway/tree/layout.c | 13 |
4 files changed, 17 insertions, 18 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 88ca67e9..23014dbe 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -132,10 +132,6 @@ struct sway_container *container_destroy(struct sway_container *container); | |||
132 | 132 | ||
133 | struct sway_container *container_close(struct sway_container *container); | 133 | struct sway_container *container_close(struct sway_container *container); |
134 | 134 | ||
135 | // TODO move to layout.c | ||
136 | struct sway_container *container_set_layout(struct sway_container *container, | ||
137 | enum sway_container_layout layout); | ||
138 | |||
139 | // TODO rename to container_descendants_for_each() | 135 | // TODO rename to container_descendants_for_each() |
140 | void container_descendants(struct sway_container *root, | 136 | void container_descendants(struct sway_container *root, |
141 | enum sway_container_type type, | 137 | enum sway_container_type type, |
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index 9d33d561..725422c6 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h | |||
@@ -41,10 +41,13 @@ struct sway_container *container_add_sibling(struct sway_container *parent, | |||
41 | struct sway_container *container_remove_child(struct sway_container *child); | 41 | struct sway_container *container_remove_child(struct sway_container *child); |
42 | 42 | ||
43 | // TODO PRIVATE in tree.h | 43 | // TODO PRIVATE in tree.h |
44 | |||
45 | struct sway_container *container_replace_child(struct sway_container *child, | 44 | struct sway_container *container_replace_child(struct sway_container *child, |
46 | struct sway_container *new_child); | 45 | struct sway_container *new_child); |
47 | 46 | ||
47 | // TODO move to layout.c | ||
48 | struct sway_container *container_set_layout(struct sway_container *container, | ||
49 | enum sway_container_layout layout); | ||
50 | |||
48 | // TODO move to tree.h | 51 | // TODO move to tree.h |
49 | void container_move_to(struct sway_container* container, | 52 | void container_move_to(struct sway_container* container, |
50 | struct sway_container* destination); | 53 | struct sway_container* destination); |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 7cc8caa6..a79bc22c 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -441,19 +441,6 @@ struct sway_container *container_view_create(struct sway_container *sibling, | |||
441 | return swayc; | 441 | return swayc; |
442 | } | 442 | } |
443 | 443 | ||
444 | struct sway_container *container_set_layout(struct sway_container *container, | ||
445 | enum sway_container_layout layout) { | ||
446 | if (container->type == C_WORKSPACE) { | ||
447 | container->workspace_layout = layout; | ||
448 | if (layout == L_HORIZ || layout == L_VERT) { | ||
449 | container->layout = layout; | ||
450 | } | ||
451 | } else { | ||
452 | container->layout = layout; | ||
453 | } | ||
454 | return container; | ||
455 | } | ||
456 | |||
457 | void container_descendants(struct sway_container *root, | 444 | void container_descendants(struct sway_container *root, |
458 | enum sway_container_type type, | 445 | enum sway_container_type type, |
459 | void (*func)(struct sway_container *item, void *data), void *data) { | 446 | void (*func)(struct sway_container *item, void *data), void *data) { |
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 487f895f..dfcdbb9c 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -47,6 +47,19 @@ static void output_layout_change_notify(struct wl_listener *listener, | |||
47 | arrange_windows(&root_container, -1, -1); | 47 | arrange_windows(&root_container, -1, -1); |
48 | } | 48 | } |
49 | 49 | ||
50 | struct sway_container *container_set_layout(struct sway_container *container, | ||
51 | enum sway_container_layout layout) { | ||
52 | if (container->type == C_WORKSPACE) { | ||
53 | container->workspace_layout = layout; | ||
54 | if (layout == L_HORIZ || layout == L_VERT) { | ||
55 | container->layout = layout; | ||
56 | } | ||
57 | } else { | ||
58 | container->layout = layout; | ||
59 | } | ||
60 | return container; | ||
61 | } | ||
62 | |||
50 | void layout_init(void) { | 63 | void layout_init(void) { |
51 | root_container.id = 0; // normally assigned in new_swayc() | 64 | root_container.id = 0; // normally assigned in new_swayc() |
52 | root_container.type = C_ROOT; | 65 | root_container.type = C_ROOT; |