discomfitor pushed a commit to branch enlightenment-0.22.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=eb2bdeb4438fb4ea75114d9069e39ff961365c77

commit eb2bdeb4438fb4ea75114d9069e39ff961365c77
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Wed Mar 28 18:23:20 2018 +0900

    e mouse bindings - fix wheel conflict check to check only dir 0
    
    allows ylou to bund extra wheels for desktop switching ... much
    better. no conflicts with signals :)
---
 src/modules/conf_bindings/e_int_config_mousebindings.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/conf_bindings/e_int_config_mousebindings.c 
b/src/modules/conf_bindings/e_int_config_mousebindings.c
index 804a1def6..1d8ef595b 100644
--- a/src/modules/conf_bindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_bindings/e_int_config_mousebindings.c
@@ -236,7 +236,9 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, 
E_Config_Dialog_Data *cfdata
 
    EINA_LIST_FOREACH_SAFE(cfdata->binding.wheel, l, l2, bw)
      {
-        if ((!bw->modifiers) && ((bw->context == E_BINDING_CONTEXT_WINDOW) || 
(bw->context == E_BINDING_CONTEXT_ANY)))
+        if ((!bw->modifiers) && 
+            (bw->direction == 0) &&
+            ((bw->context == E_BINDING_CONTEXT_WINDOW) || (bw->context == 
E_BINDING_CONTEXT_ANY)))
           {
              const char *msg = _("Unable to set a mouse wheel binding without 
modifiers<ps/>"
                                   "on a window: conflict with existing edje 
signal bindings.<ps/>"

-- 


Reply via email to