diff options
author | 2018-05-28 09:16:33 +0100 | |
---|---|---|
committer | 2018-05-28 09:16:33 +0100 | |
commit | 9d1049ae8d25eb78eb94dcf68aadad5eef6e4be1 (patch) | |
tree | c7d20de9d9a46293d7409d624372abf6f796e400 /sway/tree/layout.c | |
parent | Merge pull request #2057 from RyanDwyer/swaymsg-fix-exit-code (diff) | |
parent | Fix ancestor typos (diff) | |
download | sway-9d1049ae8d25eb78eb94dcf68aadad5eef6e4be1.tar.gz sway-9d1049ae8d25eb78eb94dcf68aadad5eef6e4be1.tar.zst sway-9d1049ae8d25eb78eb94dcf68aadad5eef6e4be1.zip |
Merge pull request #2059 from RyanDwyer/ancestor-typo
Fix ancestor typos
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) { | |||
157 | void container_move_to(struct sway_container *container, | 157 | void container_move_to(struct sway_container *container, |
158 | struct sway_container *destination) { | 158 | struct sway_container *destination) { |
159 | if (container == destination | 159 | if (container == destination |
160 | || container_has_anscestor(container, destination)) { | 160 | || container_has_ancestor(container, destination)) { |
161 | return; | 161 | return; |
162 | } | 162 | } |
163 | struct sway_container *old_parent = container_remove_child(container); | 163 | struct sway_container *old_parent = container_remove_child(container); |
@@ -945,9 +945,9 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) { | |||
945 | "Can only swap containers and views")) { | 945 | "Can only swap containers and views")) { |
946 | return; | 946 | return; |
947 | } | 947 | } |
948 | if (!sway_assert(!container_has_anscestor(con1, con2) | 948 | if (!sway_assert(!container_has_ancestor(con1, con2) |
949 | && !container_has_anscestor(con2, con1), | 949 | && !container_has_ancestor(con2, con1), |
950 | "Cannot swap anscestor and descendant")) { | 950 | "Cannot swap ancestor and descendant")) { |
951 | return; | 951 | return; |
952 | } | 952 | } |
953 | if (!sway_assert(con1->layout != L_FLOATING && con2->layout != L_FLOATING, | 953 | if (!sway_assert(con1->layout != L_FLOATING && con2->layout != L_FLOATING, |