diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-06 13:57:04 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-04-06 13:57:04 -0400 |
commit | c8be7bfc1e0c65730a5bf713e61105cd38bf9f4f (patch) | |
tree | 5fa4acddfe3f9d94cb3d641980038a0c9435a637 /sway/tree/layout.c | |
parent | Fix moving into right end of container (diff) | |
download | sway-c8be7bfc1e0c65730a5bf713e61105cd38bf9f4f.tar.gz sway-c8be7bfc1e0c65730a5bf713e61105cd38bf9f4f.tar.zst sway-c8be7bfc1e0c65730a5bf713e61105cd38bf9f4f.zip |
Fix another of @orestisf1993's issues
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index f4049c71..b03b80d9 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -364,8 +364,8 @@ void container_move(struct sway_container *container, | |||
364 | return; | 364 | return; |
365 | } | 365 | } |
366 | } else { | 366 | } else { |
367 | wlr_log(L_DEBUG, "Selecting sibling"); | ||
368 | sibling = parent->children->items[index + offs]; | 367 | sibling = parent->children->items[index + offs]; |
368 | wlr_log(L_DEBUG, "Selecting sibling id:%zd", sibling->id); | ||
369 | } | 369 | } |
370 | } else { | 370 | } else { |
371 | wlr_log(L_DEBUG, "Moving up to find a parallel container"); | 371 | wlr_log(L_DEBUG, "Moving up to find a parallel container"); |
@@ -419,9 +419,12 @@ void container_move(struct sway_container *container, | |||
419 | container_remove_child(container); | 419 | container_remove_child(container); |
420 | struct sway_container *focus_inactive = seat_get_focus_inactive( | 420 | struct sway_container *focus_inactive = seat_get_focus_inactive( |
421 | config->handler_context.seat, sibling); | 421 | config->handler_context.seat, sibling); |
422 | wlr_log(L_DEBUG, "Focus inactive: %zd", focus_inactive ? | ||
423 | focus_inactive->id : 0); | ||
424 | if (focus_inactive) { | 422 | if (focus_inactive) { |
423 | while (focus_inactive->parent != sibling) { | ||
424 | focus_inactive = focus_inactive->parent; | ||
425 | } | ||
426 | wlr_log(L_DEBUG, "Focus inactive: id:%zd", | ||
427 | focus_inactive->id); | ||
425 | sibling = focus_inactive; | 428 | sibling = focus_inactive; |
426 | continue; | 429 | continue; |
427 | } else if (sibling->children->length) { | 430 | } else if (sibling->children->length) { |