mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybar: Fix scroll handling on workspace buttons

Browse source 
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.
This commit is contained in:
minus 2018-07-19 21:15:01 +02:00
parent da9c86c608
commit bfcfabee2b
5 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
swaybar/render.c
View file

@ -108,11 +108,11 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
}
}
static void block_hotspot_callback(struct swaybar_output *output,
static enum hotspot_event_handling block_hotspot_callback(struct swaybar_output *output,
int x, int y, enum x11_button button, void *data) {
struct i3bar_block *block = data;
struct status_line *status = output->bar->status;
i3bar_block_send_click(status, block, x, y, button);
return i3bar_block_send_click(status, block, x, y, button);
}
static uint32_t render_status_block(cairo_t *cairo,
@ -348,9 +348,13 @@ static const char *strip_workspace_number(const char *ws_name) {
return ws_name;
}
static void workspace_hotspot_callback(struct swaybar_output *output,
static enum hotspot_event_handling workspace_hotspot_callback(struct swaybar_output *output,
int x, int y, enum x11_button button, void *data) {
if (button != LEFT) {
return HOTSPOT_PROCESS;
}
ipc_send_workspace_command(output->bar, (const char *)data);
return HOTSPOT_IGNORE;
}
static uint32_t render_workspace_button(cairo_t *cairo,