applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-scroll-split'

Browse Source
This commit is contained in:
Michael Stapelberg 2012-12-19 21:40:48 +01:00
commit 770ead6222
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/click.c
View File

@ -210,9 +210,16 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
event->detail == XCB_BUTTON_INDEX_5)) { event->detail == XCB_BUTTON_INDEX_5)) {
DLOG("Scrolling on a window decoration\n"); DLOG("Scrolling on a window decoration\n");
orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ); orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ);
/* Focus the currently focused container on the same level that the
* user scrolled on. e.g. the tabbed decoration contains
* "urxvt | i3: V[xterm geeqie] | firefox",
* focus is on the xterm, but the user scrolled on urxvt.
* The splitv container will be focused. */
Con *focused = con->parent;
focused = TAILQ_FIRST(&(focused->focus_head));
con_focus(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. */
Con *focused = con_descend_focused(con->parent);
bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL); bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL);
bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL); bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL);
if (event->detail == XCB_BUTTON_INDEX_4 && scroll_prev_possible) if (event->detail == XCB_BUTTON_INDEX_4 && scroll_prev_possible)