alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

input: fully change focus when scrolling tabs/stacks

Browse source 
When scrolling on a tabbed/stacked container, i3 focuses its
inactive-focused focused child. Sway does the same, but then resets the
focus to whatever was focused previously.

Ref e5992eed16/src/click.c (L207-L219)
This commit is contained in:
Tudor Brindus 2020-10-25 13:17:47 -04:00 committed by Brian Ashworth
parent 60d95414d4
commit c523aa623b
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/input/seatop_default.c
View file

@ -703,19 +703,14 @@ static void handle_pointer_axis(struct sway_seat *seat,
} else if (desired >= siblings->length) { } else if (desired >= siblings->length) {
desired = siblings->length - 1; desired = siblings->length - 1;
} }
struct sway_node *old_focus = seat_get_focus(seat);
struct sway_container *new_sibling_con = siblings->items[desired]; struct sway_container *new_sibling_con = siblings->items[desired];
struct sway_node *new_sibling = &new_sibling_con->node; struct sway_node *new_sibling = &new_sibling_con->node;
struct sway_node *new_focus = struct sway_node *new_focus =
seat_get_focus_inactive(seat, new_sibling); seat_get_focus_inactive(seat, new_sibling);
if (node_has_ancestor(old_focus, tabcontainer)) { // Use the focused child of the tabbed/stacked container, not the
// container the user scrolled on.
seat_set_focus(seat, new_focus); seat_set_focus(seat, new_focus);
} else {
// Scrolling when focus is not in the tabbed container at all
seat_set_raw_focus(seat, new_sibling);
seat_set_raw_focus(seat, new_focus);
seat_set_raw_focus(seat, old_focus);
}
handled = true; handled = true;
} }
} }