enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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

Patch by Bluezery.

SVN revision: 66310
This commit is contained in:
Tom Hacohen 2011-12-18 08:45:59 +00:00
parent 2e37317cbc
commit 0fac1e15ff
6 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/config/default/base.src
View File

@ -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;

1
legacy/elementary/config/illume/base.src
View File

@ -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;

1
legacy/elementary/config/standard/base.src
View File

@ -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;

2
legacy/elementary/src/lib/elm_config.c
View File

@ -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() */

2
legacy/elementary/src/lib/elm_gesture_layer.c
View File

@ -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))

1
legacy/elementary/src/lib/elm_priv.h
View File

@ -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;