diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-04 23:06:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 23:06:42 -0400 |
commit | 891e1148bee2575522312078f96eb4c41af49c6c (patch) | |
tree | 3044fb62120ca23499d31275076af50db09a9850 /sway/tree/layout.c | |
parent | Merge pull request #1732 from emersion/view-children (diff) | |
parent | Merge branch 'wlroots' into fix-focus-inactive (diff) | |
download | sway-891e1148bee2575522312078f96eb4c41af49c6c.tar.gz sway-891e1148bee2575522312078f96eb4c41af49c6c.tar.zst sway-891e1148bee2575522312078f96eb4c41af49c6c.zip |
Merge pull request #1733 from acrisci/fix-focus-inactive
try to fix focus-inactive
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 5abdbc32..1769609b 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -638,16 +638,16 @@ struct sway_container *container_get_in_direction( | |||
638 | wrap_candidate = parent->children->items[0]; | 638 | wrap_candidate = parent->children->items[0]; |
639 | } | 639 | } |
640 | if (config->force_focus_wrapping) { | 640 | if (config->force_focus_wrapping) { |
641 | return seat_get_focus_by_type(seat, | 641 | return wrap_candidate; |
642 | wrap_candidate, C_VIEW); | ||
643 | } | 642 | } |
644 | } | 643 | } |
645 | } else { | 644 | } else { |
645 | struct sway_container *desired_con = parent->children->items[desired]; | ||
646 | wlr_log(L_DEBUG, | 646 | wlr_log(L_DEBUG, |
647 | "cont %d-%p dir %i sibling %d: %p", idx, | 647 | "cont %d-%p dir %i sibling %d: %p", idx, |
648 | container, dir, desired, parent->children->items[desired]); | 648 | container, dir, desired, desired_con); |
649 | return seat_get_focus_by_type(seat, | 649 | struct sway_container *next = seat_get_focus_by_type(seat, desired_con, C_VIEW); |
650 | parent->children->items[desired], C_VIEW); | 650 | return next; |
651 | } | 651 | } |
652 | } | 652 | } |
653 | 653 | ||