nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Activate the focused child when scrolling over tab/stack decorations 

fbce834b introduced a bug where scrolling over the decoration while
another container is focused would not focus the tabbed/stacked
container itself, but would instead move focus through the currently
focused container.
This commit is contained in:
Dan Elkouby 2018-05-05 13:30:48 +03:00
parent d302af2312
commit 94bc401680
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/click.c
View File

@ -235,6 +235,7 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
* container the user scrolled on. */ * container the user scrolled on. */
Con *focused = con->parent; Con *focused = con->parent;
focused = TAILQ_FIRST(&(focused->focus_head)); focused = TAILQ_FIRST(&(focused->focus_head));
con_activate(con_descend_focused(focused));
/* To prevent scrolling from going outside the container (see ticket /* To prevent scrolling from going outside the container (see ticket
* #557), we first check if scrolling is possible at all. */ * #557), we first check if scrolling is possible at all. */
bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL); bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL);

7
testcases/t/297-scroll-tabbed.t
View File

@ -53,7 +53,7 @@ open_window;
cmd 'splitv'; cmd 'splitv';
my $last = open_window; my $last = open_window;
# Second child of the outer horizontal split, next to the tabbed one. # Second child of the outer horizontal split, next to the tabbed one.
open_window; my $outside = open_window;
cmd 'move right, move right'; cmd 'move right, move right';
cmd '[id=' . $first->id . '] focus'; cmd '[id=' . $first->id . '] focus';
@ -76,4 +76,9 @@ is($x->input_focus, $first->id, 'First window focused through scrolling');
scroll_up; scroll_up;
is($x->input_focus, $first->id, 'Scrolling again doesn\'t focus the whole sibling'); is($x->input_focus, $first->id, 'Scrolling again doesn\'t focus the whole sibling');
# Try scrolling with another window focused
cmd '[id=' . $outside->id . '] focus';
scroll_up;
is($x->input_focus, $first->id, 'Scrolling from outside the tabbed container works');
done_testing; done_testing;