From bbf270008f8dd0170f0497de82c21f3437ac9627 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Wed, 21 Dec 2011 14:52:35 +0900 Subject: [PATCH] Merge with upstream r66368 Elm glayer: Added config value to multi-touch rotation. Change-Id: I4a86bc57f2fa889ff56eb32df7c66313bbb860a4 --- config/default/base.src | 1 + config/illume/base.src | 1 + 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, 8 insertions(+), 1 deletion(-) diff --git a/config/default/base.src b/config/default/base.src index dce1988..4287f5b 100644 --- a/config/default/base.src +++ b/config/default/base.src @@ -44,6 +44,7 @@ group "Elm_Config" struct { 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_finger_enable" uchar: 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; diff --git a/config/illume/base.src b/config/illume/base.src index b3f6e04..9e2fc9e 100644 --- a/config/illume/base.src +++ b/config/illume/base.src @@ -49,6 +49,7 @@ group "Elm_Config" struct { 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_finger_enable" uchar: 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; diff --git a/config/slp/base.src b/config/slp/base.src index 062dc70..91708c3 100644 --- a/config/slp/base.src +++ b/config/slp/base.src @@ -48,6 +48,7 @@ group "Elm_Config" struct { 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_finger_enable" uchar: 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; diff --git a/config/standard/base.src b/config/standard/base.src index 66ec1d9..10f57bf 100644 --- a/config/standard/base.src +++ b/config/standard/base.src @@ -48,6 +48,7 @@ group "Elm_Config" struct { 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_finger_enable" uchar: 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; diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index c4fb920..16e7a3f 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -625,6 +625,7 @@ _desc_init(void) 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); + ELM_CONFIG_VAL(D, T, glayer_rotate_finger_enable, T_UCHAR); ELM_CONFIG_VAL(D, T, glayer_rotate_angular_tolerance, T_DOUBLE); ELM_CONFIG_VAL(D, T, glayer_line_min_length, T_DOUBLE); ELM_CONFIG_VAL(D, T, glayer_line_distance_tolerance, T_DOUBLE); @@ -1196,6 +1197,7 @@ _config_load(void) _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() */ + _elm_config->glayer_rotate_finger_enable = EINA_FALSE; _elm_config->glayer_rotate_angular_tolerance = 0.034906585; /* Represents 2 DEG */ _elm_config->glayer_line_min_length = 1.0; /* 1 times elm_finger_size_get() */ _elm_config->glayer_line_distance_tolerance = 3.0; /* 3 times elm_finger_size_get() */ diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c index a37bba1..b4e8190 100644 --- a/src/lib/elm_gesture_layer.c +++ b/src/lib/elm_gesture_layer.c @@ -3075,7 +3075,7 @@ _event_process(void *data, Evas_Object *obj __UNUSED__, if (IS_TESTED(ELM_GESTURE_ZOOM)) _zoom_with_wheel_test(data, event_info, event_type, ELM_GESTURE_ZOOM); - if (IS_TESTED(ELM_GESTURE_ROTATE)) + if (_elm_config->glayer_rotate_finger_enable && IS_TESTED(ELM_GESTURE_ROTATE)) _rotate_test(data, pe, event_info, event_type, ELM_GESTURE_ROTATE); if (_get_event_flag(event_info, event_type) & EVAS_EVENT_FLAG_ON_HOLD) diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index 221996e..ae1278c 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -139,6 +139,7 @@ struct _Elm_Config double glayer_zoom_finger_factor; double glayer_zoom_wheel_factor; double glayer_zoom_distance_tolerance; + double glayer_rotate_finger_enable; double glayer_rotate_angular_tolerance; double glayer_line_min_length; double glayer_line_distance_tolerance; -- 2.7.4