diff options
| author | emersion <contact@emersion.fr> | 2019-01-10 00:32:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 00:32:09 +0100 |
| commit | d0b9701820bd92e008e73693d5e61d672372e7e1 (patch) | |
| tree | d79b572e87e9f95151f762078d427c5839798384 /sway | |
| parent | 14cab7861294189f820e0830ae84ac7b15271342 (diff) | |
| parent | a8b3ae92844f9d0cbd9266ff0731889fd7da0ad5 (diff) | |
| download | sway-d0b9701820bd92e008e73693d5e61d672372e7e1.tar.xz | |
Merge pull request #3396 from RedSoxFan/scroll-titlebar-border
cursor: allow scrolling tabs/stack on title border
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/input/cursor.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 96feb47d..07c3fe1d 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -1092,6 +1092,8 @@ static void dispatch_cursor_axis(struct sway_cursor *cursor, enum wlr_edges edge = cont ? find_edge(cont, cursor) : WLR_EDGE_NONE; bool on_border = edge != WLR_EDGE_NONE; bool on_titlebar = cont && !on_border && !surface; + bool on_titlebar_border = cont && on_border && + cursor->cursor->y < cont->content_y; bool on_contents = cont && !on_border && surface; float scroll_factor = (ic == NULL || ic->scroll_factor == FLT_MIN) ? 1.0f : ic->scroll_factor; @@ -1117,7 +1119,7 @@ static void dispatch_cursor_axis(struct sway_cursor *cursor, } // Scrolling on a tabbed or stacked title bar (handled as press event) - if (!handled && on_titlebar) { + if (!handled && (on_titlebar || on_titlebar_border)) { enum sway_container_layout layout = container_parent_layout(cont); if (layout == L_TABBED || layout == L_STACKED) { struct sway_node *tabcontainer = node_get_parent(node); |