From 20f3756bc226e01266688b7cd29075a255cbc6a6 Mon Sep 17 00:00:00 2001 From: tasn Date: Sun, 18 Dec 2011 08:45:59 +0000 Subject: [PATCH] Elementary glayer: Added a config value to disable multitouch zoom. Patch by Bluezery. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@66310 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- config/default/base.src | 1 + config/illume/base.src | 1 + config/standard/base.src | 1 + src/lib/elm_config.c | 2 ++ src/lib/elm_gesture_layer.c | 2 +- src/lib/elm_priv.h | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/default/base.src b/config/default/base.src index c1dde65..3493915 100644 --- a/config/default/base.src +++ b/config/default/base.src @@ -40,6 +40,7 @@ group "Elm_Config" struct { value "desktop_entry" uchar: 0; value "password_show_last" uchar: 0; value "password_show_last_timeout" double: 2.0; + value "glayer_zoom_finger_enable" uchar: 0; value "glayer_zoom_finger_factor" double: 1.0; value "glayer_zoom_wheel_factor" double: 0.05; value "glayer_zoom_distance_tolerance" double: 1.0; diff --git a/config/illume/base.src b/config/illume/base.src index c2a5df4..7595d4f 100644 --- a/config/illume/base.src +++ b/config/illume/base.src @@ -44,6 +44,7 @@ group "Elm_Config" struct { value "desktop_entry" uchar: 0; value "password_show_last" uchar: 1; value "password_show_last_timeout" double: 2.0; + value "glayer_zoom_finger_enable" uchar: 0; value "glayer_zoom_finger_factor" double: 1.0; value "glayer_zoom_wheel_factor" double: 0.05; value "glayer_zoom_distance_tolerance" double: 1.0; diff --git a/config/standard/base.src b/config/standard/base.src index 67a1b70..d0b0282 100644 --- a/config/standard/base.src +++ b/config/standard/base.src @@ -44,6 +44,7 @@ group "Elm_Config" struct { value "desktop_entry" uchar: 1; value "password_show_last" uchar: 0; value "password_show_last_timeout" double: 2.0; + value "glayer_zoom_finger_enable" uchar: 0; value "glayer_zoom_finger_factor" double: 1.0; value "glayer_zoom_wheel_factor" double: 0.05; value "glayer_zoom_distance_tolerance" double: 1.0; diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index 1424c81..29cc3e2 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -318,6 +318,7 @@ _desc_init(void) ELM_CONFIG_VAL(D, T, desktop_entry, T_UCHAR); ELM_CONFIG_VAL(D, T, password_show_last, T_UCHAR); ELM_CONFIG_VAL(D, T, password_show_last_timeout, T_DOUBLE); + ELM_CONFIG_VAL(D, T, glayer_zoom_finger_enable, T_UCHAR); ELM_CONFIG_VAL(D, T, glayer_zoom_finger_factor, T_DOUBLE); ELM_CONFIG_VAL(D, T, glayer_zoom_wheel_factor, T_DOUBLE); ELM_CONFIG_VAL(D, T, glayer_zoom_distance_tolerance, T_DOUBLE); @@ -887,6 +888,7 @@ _config_load(void) _elm_config->is_mirrored = EINA_FALSE; /* Read sys value in env_get() */ _elm_config->password_show_last = EINA_FALSE; _elm_config->password_show_last_timeout = 2.0; + _elm_config->glayer_zoom_finger_enable = EINA_FALSE; _elm_config->glayer_zoom_finger_factor = 1.0; _elm_config->glayer_zoom_wheel_factor = 0.05; _elm_config->glayer_zoom_distance_tolerance = 1.0; /* 1 times elm_finger_size_get() */ diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c index 8300565..813a8fe 100644 --- a/src/lib/elm_gesture_layer.c +++ b/src/lib/elm_gesture_layer.c @@ -3110,7 +3110,7 @@ _event_process(void *data, Evas_Object *obj __UNUSED__, if (IS_TESTED(ELM_GESTURE_N_FLICKS)) _n_line_test(data, pe, event_info, event_type, ELM_GESTURE_N_FLICKS); - if (IS_TESTED(ELM_GESTURE_ZOOM)) + if (_elm_config->glayer_zoom_finger_enable && IS_TESTED(ELM_GESTURE_ZOOM)) _zoom_test(data, pe, event_info, event_type, ELM_GESTURE_ZOOM); if (IS_TESTED(ELM_GESTURE_ZOOM)) diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index f7a874e..ba18e4b 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -149,6 +149,7 @@ struct _Elm_Config unsigned char desktop_entry; Eina_Bool password_show_last; double password_show_last_timeout; + Eina_Bool glayer_zoom_finger_enable; double glayer_zoom_finger_factor; double glayer_zoom_wheel_factor; double glayer_zoom_distance_tolerance; -- 2.7.4