aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2018-11-05 12:39:44 -0500
committerBrian Ashworth <bosrsf04@gmail.com>2018-11-05 12:39:44 -0500
commitc8c1ecaf258188266161832991fc52999eddbfc7 (patch)
treedb770f567e0f6ca7627c2afbbcc8549ced846419 /sway
parent77d581f1441357d254acc70ad826a8fa67dd4dd0 (diff)
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.
Diffstat (limited to 'sway')
-rw-r--r--sway/commands/focus.c8
1 files changed, 8 insertions, 0 deletions
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;
}