diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-08 16:05:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-08 16:05:03 -0400 |
commit | 07b6be62144f84539b97ce9d41e9a6c5792deb54 (patch) | |
tree | e5031e3e9a86c67bde038523b2d2cbf773a7303e /sway/tree/layout.c | |
parent | Merge pull request #1781 from swaywm/map-to-output (diff) | |
parent | 80char (diff) | |
download | sway-07b6be62144f84539b97ce9d41e9a6c5792deb54.tar.gz sway-07b6be62144f84539b97ce9d41e9a6c5792deb54.tar.zst sway-07b6be62144f84539b97ce9d41e9a6c5792deb54.zip |
Merge pull request #1769 from acrisci/focus-inactive-fixes
Focus inactive fixes
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 5 |
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, | |||
251 | container_flatten(ws); | 251 | container_flatten(ws); |
252 | container_reap_empty_recursive(original_parent); | 252 | container_reap_empty_recursive(original_parent); |
253 | wl_signal_emit(&child->events.reparent, original_parent); | 253 | wl_signal_emit(&child->events.reparent, original_parent); |
254 | container_create_notify(new_parent); | ||
254 | arrange_windows(ws, -1, -1); | 255 | arrange_windows(ws, -1, -1); |
255 | } | 256 | } |
256 | 257 | ||
@@ -872,7 +873,7 @@ struct sway_container *container_get_in_direction( | |||
872 | } | 873 | } |
873 | if (next->children && next->children->length) { | 874 | if (next->children && next->children->length) { |
874 | // TODO consider floating children as well | 875 | // TODO consider floating children as well |
875 | return seat_get_focus_by_type(seat, next, C_VIEW); | 876 | return seat_get_focus_inactive_view(seat, next); |
876 | } else { | 877 | } else { |
877 | return next; | 878 | return next; |
878 | } | 879 | } |
@@ -910,7 +911,7 @@ struct sway_container *container_get_in_direction( | |||
910 | wlr_log(L_DEBUG, | 911 | wlr_log(L_DEBUG, |
911 | "cont %d-%p dir %i sibling %d: %p", idx, | 912 | "cont %d-%p dir %i sibling %d: %p", idx, |
912 | container, dir, desired, desired_con); | 913 | container, dir, desired, desired_con); |
913 | struct sway_container *next = seat_get_focus_by_type(seat, desired_con, C_VIEW); | 914 | struct sway_container *next = seat_get_focus_inactive_view(seat, desired_con); |
914 | return next; | 915 | return next; |
915 | } | 916 | } |
916 | } | 917 | } |