aboutsummaryrefslogtreecommitdiff
path: root/sway/tree/layout.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-04-04 23:06:42 -0400
committerGitHub <noreply@github.com>2018-04-04 23:06:42 -0400
commit891e1148bee2575522312078f96eb4c41af49c6c (patch)
tree3044fb62120ca23499d31275076af50db09a9850 /sway/tree/layout.c
parent21aedf15052df4e7f8ee72922fa0e214d690facc (diff)
parent65f254f3fbc83d006d4ec29170ec8a8695345d6c (diff)
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.c10
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(
wrap_candidate = parent->children->items[0];
}
if (config->force_focus_wrapping) {
- return seat_get_focus_by_type(seat,
- wrap_candidate, C_VIEW);
+ return wrap_candidate;
}
}
} else {
+ struct sway_container *desired_con = parent->children->items[desired];
wlr_log(L_DEBUG,
"cont %d-%p dir %i sibling %d: %p", idx,
- container, dir, desired, parent->children->items[desired]);
- return seat_get_focus_by_type(seat,
- parent->children->items[desired], C_VIEW);
+ container, dir, desired, desired_con);
+ struct sway_container *next = seat_get_focus_by_type(seat, desired_con, C_VIEW);
+ return next;
}
}