Elementary glayer: Added a config value to disable multitouch zoom.

Patch by Bluezery.

SVN revision: 66310

diff --git a/config/default/base.src b/config/default/base.src
index c1dde657d9d3e91732f83ec26712e68c3e00509c..349391530869a1d0eb9c84948e0a89ed59b90712 100644 (file)
--- 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 c2a5df4b393f12847534511ab94ebd079666fcb1..7595d4fcce60ff26dff5ad182067d2a395d0cd42 100644 (file)
--- 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 67a1b70993e32cca1441e7ffed2b3f34b9118a21..d0b0282b4f0f9d40943b41974cebe4a30c0d19dc 100644 (file)
--- 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 1424c811c4d7b149e25f49a5b0782fc3f3233fa1..29cc3e2744a51d2c707ec40f07e8b455db5e0830 100644 (file)
--- 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 83005655722ebc0e5a020a95ddf1e79a910c0d55..813a8fead0d11f14e0a205c39dd6bcf8274451b4 100644 (file)
--- 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 f7a874e2d0216081d5c04bca7724a214d2f38715..ba18e4bcafd7d8170b3a079251de8236a8605a62 100644 (file)
--- 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;