sway

commit 4637462a6860cebcbf0ff196f84363a452db651d
parent 643bd8f15816d0443f3e8d2a32ef6b20547cd389
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat, 23 Jul 2016 11:03:21 -0400

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

don't passthrough a floating_scroll event to focused window
Diffstat:
M
sway/handlers.c
 | 
14
++++++++++----

1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/sway/handlers.c b/sway/handlers.c
@@ -876,15 +876,21 @@ bool handle_pointer_scroll(wlc_handle view, uint32_t time, const struct wlc_modi
 	if (!(modifiers->mods ^ config->floating_mod)) {
 		int x_amount = (int)_amount[0];
 		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);
-		} 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);
+			return EVENT_HANDLED;
 		}
-		if (y_amount > 0) {
+
+		if (y_amount > 0 && strcmp(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);
+			return EVENT_HANDLED;
 		}
 	}
 	return EVENT_PASSTHROUGH;