From c8c1ecaf258188266161832991fc52999eddbfc7 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 5 Nov 2018 12:39:44 -0500 Subject: Fix focus_wrapping yes It appears that the focus code that handles `focus_wrapping yes` was removed during the conversion to type safety. This re-implements the focus code for when `focus_wrapping` is set to `yes` (default). Neither the `no` or `force` options appear to be effected and should be working. --- sway/commands/focus.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sway') diff --git a/sway/commands/focus.c b/sway/commands/focus.c index cef92144..f6338c55 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -156,6 +156,14 @@ static struct sway_node *node_get_in_direction(struct sway_container *container, if (new_output) { return get_node_in_output_direction(new_output, dir); } + + // If there is a wrap candidate, return its focus inactive view + if (wrap_candidate) { + struct sway_container *wrap_inactive = seat_get_focus_inactive_view( + seat, &wrap_candidate->node); + return &wrap_inactive->node; + } + return NULL; } -- cgit v1.2.3