From 9b75256e0911a8de41bff714b401f3f25150d3a4 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Fri, 8 Jun 2012 11:18:52 +0000 Subject: [PATCH] E: Fix mouse wheel binding bugger that was setting the wrong labels for mouse wheel events. (Z is actually -1 for wheel up and 1 for wheel down). SVN revision: 71845 --- .../e_int_config_mousebindings.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/modules/conf_keybindings/e_int_config_mousebindings.c b/src/modules/conf_keybindings/e_int_config_mousebindings.c index 02d2f99ed..49ae987cc 100644 --- a/src/modules/conf_keybindings/e_int_config_mousebindings.c +++ b/src/modules/conf_keybindings/e_int_config_mousebindings.c @@ -1192,18 +1192,17 @@ _helper_wheel_name_get(E_Config_Binding_Wheel *bw) switch (bw->direction) { case 0: - if (bw->z >= 0) - name = strdup("Mouse Wheel Up"); - else - name = strdup("Mouse Wheel Down"); - break; - + if (bw->z < 0) + name = strdup("Mouse Wheel Up"); + else + name = strdup("Mouse Wheel Down"); + break; default: - if (bw->z >= 0) - snprintf(buf, sizeof(buf), "Extra Wheel (%d) Up", bw->direction); - else - snprintf(buf, sizeof(buf), "Extra Wheel (%d) Down", bw->direction); - name = strdup(buf); + if (bw->z < 0) + snprintf(buf, sizeof(buf), "Extra Wheel (%d) Up", bw->direction); + else + snprintf(buf, sizeof(buf), "Extra Wheel (%d) Down", bw->direction); + name = strdup(buf); } return name; } @@ -1466,7 +1465,7 @@ _grab_mouse_wheel_cb(void *data, __UNUSED__ int type, void *event) if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT; if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) - mod |= E_BINDING_MODIFIER_WIN; + mod |= E_BINDING_MODIFIER_WIN; if (cfdata->locals.add) {