aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-11-05 18:59:44 +0100
committerLibravatar GitHub <noreply@github.com>2018-11-05 18:59:44 +0100
commite9c77970fa23a7eda88fc0dde684961e3caca5e9 (patch)
treedb770f567e0f6ca7627c2afbbcc8549ced846419 /sway
parentMerge pull request #3075 from swaywm/revert-3073-swayidle_workaround (diff)
parentFix focus_wrapping yes (diff)
downloadsway-e9c77970fa23a7eda88fc0dde684961e3caca5e9.tar.gz
sway-e9c77970fa23a7eda88fc0dde684961e3caca5e9.tar.zst
sway-e9c77970fa23a7eda88fc0dde684961e3caca5e9.zip
Merge pull request #3071 from RedSoxFan/fix-3064
Fix focus_wrapping yes
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,
156 if (new_output) { 156 if (new_output) {
157 return get_node_in_output_direction(new_output, dir); 157 return get_node_in_output_direction(new_output, dir);
158 } 158 }
159
160 // If there is a wrap candidate, return its focus inactive view
161 if (wrap_candidate) {
162 struct sway_container *wrap_inactive = seat_get_focus_inactive_view(
163 seat, &wrap_candidate->node);
164 return &wrap_inactive->node;
165 }
166
159 return NULL; 167 return NULL;
160} 168}
161 169