diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-05-25 08:43:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-25 08:43:57 -0400 |
commit | daf328d0540b3e4919ae726922b68b8edc0fc2a3 (patch) | |
tree | e938c47aeb272eacb10175e9189b9fa6bd90671e | |
parent | Merge pull request #2034 from RyanDwyer/cleanup-container-titles (diff) | |
parent | Arrange views after flattening the parent (diff) | |
download | sway-daf328d0540b3e4919ae726922b68b8edc0fc2a3.tar.gz sway-daf328d0540b3e4919ae726922b68b8edc0fc2a3.tar.zst sway-daf328d0540b3e4919ae726922b68b8edc0fc2a3.zip |
Merge pull request #2033 from RyanDwyer/arrange-after-flatten
Arrange views after flattening the parent
-rw-r--r-- | sway/tree/layout.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 6763b34c..21cec529 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -327,9 +327,11 @@ void container_move(struct sway_container *container, | |||
327 | current = container_parent(container, C_OUTPUT); | 327 | current = container_parent(container, C_OUTPUT); |
328 | } | 328 | } |
329 | 329 | ||
330 | if (parent != container_flatten(parent)) { | 330 | struct sway_container *new_parent = container_flatten(parent); |
331 | if (new_parent != parent) { | ||
331 | // Special case: we were the last one in this container, so flatten it | 332 | // Special case: we were the last one in this container, so flatten it |
332 | // and leave | 333 | // and leave |
334 | arrange_children_of(new_parent); | ||
333 | update_debug_tree(); | 335 | update_debug_tree(); |
334 | return; | 336 | return; |
335 | } | 337 | } |