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

Fix seat_get_active_child
master
emersion 7 years ago committed by GitHub
commit 6d0ad6a1ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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 *seat_get_active_child(struct sway_seat *seat,
struct sway_container *container) { struct sway_container *container) {
struct sway_container *focus = seat_get_focus_inactive(seat, container); struct sway_seat_container *current = NULL;
if (!focus) { wl_list_for_each(current, &seat->focus_stack, link) {
return NULL; 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) { struct sway_container *seat_get_focus(struct sway_seat *seat) {

Loading…
Cancel
Save