mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2099 from RyanDwyer/fix-seat-get-active-child 

Fix seat_get_active_child
This commit is contained in:
emersion 2018-06-03 18:46:48 +01:00 committed by GitHub
parent 4bc88772ec 57e78414fa
commit 6d0ad6a1ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sway/input/seat.c
View File

@ -728,14 +728,14 @@ struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
struct sway_container *seat_get_active_child(struct sway_seat *seat,
struct sway_container *container) {
struct sway_container *focus = seat_get_focus_inactive(seat, container);
if (!focus) {
return NULL;
struct sway_seat_container *current = NULL;
wl_list_for_each(current, &seat->focus_stack, link) {
if (current->container->parent == container &&
current->container->layout != L_FLOATING) {
return current->container;
}
}
while (focus->parent != container) {
focus = focus->parent;
}
return focus;
return NULL;
}
struct sway_container *seat_get_focus(struct sway_seat *seat) {