diff options
author | minus <minus@mnus.de> | 2018-07-19 21:15:01 +0200 |
---|---|---|
committer | minus <minus@mnus.de> | 2018-07-19 21:15:01 +0200 |
commit | bfcfabee2b7e6bd820929a3cb86c4981a6385ac7 (patch) | |
tree | e529edd478b8ebfbf19daa7072535d0e181592d2 /include/swaybar/bar.h | |
parent | Merge pull request #2310 from RyanDwyer/assign-output (diff) | |
download | sway-bfcfabee2b7e6bd820929a3cb86c4981a6385ac7.tar.gz sway-bfcfabee2b7e6bd820929a3cb86c4981a6385ac7.tar.zst sway-bfcfabee2b7e6bd820929a3cb86c4981a6385ac7.zip |
swaybar: Fix scroll handling on workspace buttons
As well as ignoring scroll events on status elements when click_events
is enabled.
Previously, using the scroll wheel on a workspace button would switch to
that workspace instead of scrolling through them. Clicks and scrolling
on status elements would always be processed by swaybar, too. So in case
you were using scrolling as volume control on a status item, swaybar
would additionally scroll through your workspaces.
Diffstat (limited to 'include/swaybar/bar.h')
-rw-r--r-- | include/swaybar/bar.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index f1ff25b2..1cecea71 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h | |||
@@ -29,10 +29,15 @@ enum x11_button { | |||
29 | FORWARD, | 29 | FORWARD, |
30 | }; | 30 | }; |
31 | 31 | ||
32 | enum hotspot_event_handling { | ||
33 | HOTSPOT_IGNORE, | ||
34 | HOTSPOT_PROCESS, | ||
35 | }; | ||
36 | |||
32 | struct swaybar_hotspot { | 37 | struct swaybar_hotspot { |
33 | struct wl_list link; | 38 | struct wl_list link; |
34 | int x, y, width, height; | 39 | int x, y, width, height; |
35 | void (*callback)(struct swaybar_output *output, | 40 | enum hotspot_event_handling (*callback)(struct swaybar_output *output, |
36 | int x, int y, enum x11_button button, void *data); | 41 | int x, int y, enum x11_button button, void *data); |
37 | void (*destroy)(void *data); | 42 | void (*destroy)(void *data); |
38 | void *data; | 43 | void *data; |