diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-28 12:45:42 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-28 12:45:42 +1000 |
| commit | 7c7d24600b3db2675b691ae6345ef3fefab03dbd (patch) | |
| tree | 27bdca654ca7336acc9018aeedbf6a46751a85c2 /sway/tree | |
| parent | b2c0ba5b180b75a18e622934bbed61b0f14b1661 (diff) | |
| download | sway-7c7d24600b3db2675b691ae6345ef3fefab03dbd.tar.xz | |
Fix ancestor typos
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 6 | ||||
| -rw-r--r-- | sway/tree/layout.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index a4798c7e..59137d88 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -656,11 +656,11 @@ void container_for_each_descendant_bfs(struct sway_container *con, } } -bool container_has_anscestor(struct sway_container *descendant, - struct sway_container *anscestor) { +bool container_has_ancestor(struct sway_container *descendant, + struct sway_container *ancestor) { while (descendant->type != C_ROOT) { descendant = descendant->parent; - if (descendant == anscestor) { + if (descendant == ancestor) { return true; } } diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 624d5516..aca9e254 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -157,7 +157,7 @@ struct sway_container *container_remove_child(struct sway_container *child) { void container_move_to(struct sway_container *container, struct sway_container *destination) { if (container == destination - || container_has_anscestor(container, destination)) { + || container_has_ancestor(container, destination)) { return; } struct sway_container *old_parent = container_remove_child(container); @@ -945,9 +945,9 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) { "Can only swap containers and views")) { return; } - if (!sway_assert(!container_has_anscestor(con1, con2) - && !container_has_anscestor(con2, con1), - "Cannot swap anscestor and descendant")) { + if (!sway_assert(!container_has_ancestor(con1, con2) + && !container_has_ancestor(con2, con1), + "Cannot swap ancestor and descendant")) { return; } if (!sway_assert(con1->layout != L_FLOATING && con2->layout != L_FLOATING, |