aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-04-08 16:05:03 -0400
committerGitHub <noreply@github.com>2018-04-08 16:05:03 -0400
commit07b6be62144f84539b97ce9d41e9a6c5792deb54 (patch)
treee5031e3e9a86c67bde038523b2d2cbf773a7303e /sway/tree
parent4493761716a37a0ecba596b33cfb7a6dba2d84ba (diff)
parente7771c507a6f482cc66c482d167af2d2beaff31b (diff)
Merge pull request #1769 from acrisci/focus-inactive-fixes
Focus inactive fixes
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/layout.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index e81facc6..ae76ca26 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -251,6 +251,7 @@ static void workspace_rejigger(struct sway_container *ws,
container_flatten(ws);
container_reap_empty_recursive(original_parent);
wl_signal_emit(&child->events.reparent, original_parent);
+ container_create_notify(new_parent);
arrange_windows(ws, -1, -1);
}
@@ -872,7 +873,7 @@ struct sway_container *container_get_in_direction(
}
if (next->children && next->children->length) {
// TODO consider floating children as well
- return seat_get_focus_by_type(seat, next, C_VIEW);
+ return seat_get_focus_inactive_view(seat, next);
} else {
return next;
}
@@ -910,7 +911,7 @@ struct sway_container *container_get_in_direction(
wlr_log(L_DEBUG,
"cont %d-%p dir %i sibling %d: %p", idx,
container, dir, desired, desired_con);
- struct sway_container *next = seat_get_focus_by_type(seat, desired_con, C_VIEW);
+ struct sway_container *next = seat_get_focus_inactive_view(seat, desired_con);
return next;
}
}