aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-03-28 18:23:20 +0900
committerMike Blumenkrantz <zmike@samsung.com>2018-08-02 09:53:42 -0400
commiteb2bdeb4438fb4ea75114d9069e39ff961365c77 (patch)
treede57ac86cedd547058e267ad1561495ebf33be90
parente menus - when filtering for exe handle quotes, escapes etc. (diff)
downloadenlightenment-eb2bdeb4438fb4ea75114d9069e39ff961365c77.tar.gz
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 :)
-rw-r--r--src/modules/conf_bindings/e_int_config_mousebindings.c4
1 files changed, 3 insertions, 1 deletions
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/>"