From 52df89cb634ff672f84088035485dbaf0ab9838f Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Mon, 19 Dec 2011 13:01:27 +0900 Subject: [PATCH] Merge upstream r66310 disable pinch zoom defautly. Change-Id: If5ae09821fbc8688ad924008ed854289b298e1de --- config/default/base.src | 1 + config/illume/base.src | 13 +++++++++++++ config/slp/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 + 7 files changed, 20 insertions(+), 1 deletion(-) diff --git a/config/default/base.src b/config/default/base.src index a0de3a2..dce1988 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 767f597..b3f6e04 100644 --- a/config/illume/base.src +++ b/config/illume/base.src @@ -43,4 +43,17 @@ group "Elm_Config" struct { value "longpress_timeout" double: 1.0; value "effect_enable" uchar: 1; 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; + value "glayer_rotate_angular_tolerance" double: 0.034906585; + value "glayer_line_min_length" double: 1.0; + value "glayer_line_distance_tolerance" double: 3.0; + value "glayer_line_angular_tolerance" double: 0.34906585; /* Represents 20 DEG */ + value "glayer_flick_time_limit_ms" uint: 100; /* ms to finish flick */ + value "glayer_long_tap_start_timeout" double: 1.2; /* sec to start long-tap */ + value "glayer_continues_enable" uchar: 1; /* Continues gesture enabled */ } diff --git a/config/slp/base.src b/config/slp/base.src index 27d78f4..062dc70 100644 --- a/config/slp/base.src +++ b/config/slp/base.src @@ -44,6 +44,7 @@ group "Elm_Config" struct { value "effect_enable" uchar: 1; 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 78c7d75..66ec1d9 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 5d71ed9..c4fb920 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -621,6 +621,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); @@ -1191,6 +1192,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 8f8d017..a37bba1 100644 --- a/src/lib/elm_gesture_layer.c +++ b/src/lib/elm_gesture_layer.c @@ -3069,7 +3069,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 6c70a69..221996e 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -135,6 +135,7 @@ struct _Elm_Config Eina_Bool is_mirrored : 1; 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