aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2016-07-27 22:14:20 -0400
committerFurkan Sahin <furkan-dev@proton.me>2016-07-27 22:14:20 -0400
commit579f5ed425c8a4e88edaf5de88e253190493d5b7 (patch)
treeab2c6db115963d22715f454501ecee5c33a997fb
parent4fd7f24002d2fb1504332b9dca380ffff973de50 (diff)
parent7d955edd268bd695ccb8109b434a7d2904d76bfc (diff)
Merge pull request #790 from acrisci/bug/switch-focus-workspace-output
bugfix: set focus to workspace of an output
-rw-r--r--sway/focus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/focus.c b/sway/focus.c
index d2a1e0d6..c7737a1d 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -67,9 +67,11 @@ bool move_focus(enum movement_direction direction) {
swayc_t *new_view = get_swayc_in_direction(old_view, direction);
if (!new_view) {
return false;
- } else if (new_view->type == C_ROOT || new_view->type == C_OUTPUT) {
+ } else if (new_view->type == C_ROOT) {
sway_log(L_DEBUG, "Not setting focus above the workspace level");
return false;
+ } else if (new_view->type == C_OUTPUT) {
+ return set_focused_container(swayc_active_workspace_for(new_view));
} else if (direction == MOVE_PARENT) {
return set_focused_container(new_view);
} else if (config->mouse_warping) {