mirror/sway
1
1
Fork 0
mirror of https://github.com/swaywm/sway synced 2024-11-18 19:03:59 +01:00
Code Issues

Merge pull request #785 from thejan2009/floating-scroll-event-passthrough

Browse Source 
don't passthrough a floating_scroll event to focused window
This commit is contained in:
Drew DeVault 2016-07-23 11:03:21 -04:00 committed by GitHub
commit 4637462a68
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sway/handlers.c
View File

@ -876,15 +876,21 @@ bool handle_pointer_scroll(wlc_handle view, uint32_t time, const struct wlc_modi
if (!(modifiers->mods ^ config->floating_mod)) { if (!(modifiers->mods ^ config->floating_mod)) {
int x_amount = (int)_amount[0]; int x_amount = (int)_amount[0];
int y_amount = (int)_amount[1]; int y_amount = (int)_amount[1];
if (x_amount > 0) {
if (x_amount > 0 && strcmp(config->floating_scroll_up_cmd, "")) {
handle_command(config->floating_scroll_up_cmd); handle_command(config->floating_scroll_up_cmd);
} else if (x_amount < 0) { return EVENT_HANDLED;
} else if (x_amount < 0 && strcmp(config->floating_scroll_down_cmd, "")) {
handle_command(config->floating_scroll_down_cmd); handle_command(config->floating_scroll_down_cmd);
return EVENT_HANDLED;
} }
if (y_amount > 0) {
if (y_amount > 0 && strcmp(config->floating_scroll_right_cmd, "")) {
handle_command(config->floating_scroll_right_cmd); handle_command(config->floating_scroll_right_cmd);
} else if (y_amount < 0) { return EVENT_HANDLED;
} else if (y_amount < 0 && strcmp(config->floating_scroll_left_cmd, "")) {
handle_command(config->floating_scroll_left_cmd); handle_command(config->floating_scroll_left_cmd);
return EVENT_HANDLED;
} }
} }
return EVENT_PASSTHROUGH; return EVENT_PASSTHROUGH;