summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2015-08-06 14:59:06 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2015-08-06 15:27:56 +0900
commit81ef39c393ad07eafaaab6d1eeecf14c4e912b6d (patch)
tree9fa63b44540cf6559d77379afca8fc458d9ac9e9
parentcbd906fc1194839cee70b87f29aca30056f1ae1c (diff)
elm_config: Add flag to control pushing naviframe prev button automatically.
It is decided that the naviframe prev button is automatically pushed or not by the flag "naviframe_prev_btn_auto_pushed" in config. @feature
-rw-r--r--config/default/base.src.in3
-rw-r--r--config/mobile/base.src.in3
-rw-r--r--config/standard/base.src.in3
-rw-r--r--src/lib/elc_naviframe.c2
-rw-r--r--src/lib/elm_config.c7
-rw-r--r--src/lib/elm_priv.h3
6 files changed, 16 insertions, 5 deletions
diff --git a/config/default/base.src.in b/config/default/base.src.in
index 10257ee6b..f3b741eb7 100644
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131076; 2 value "config_version" int: 131077;
3 value "engine" string: ""; 3 value "engine" string: "";
4 value "vsync" uchar: 0; 4 value "vsync" uchar: 0;
5 value "thumbscroll_enable" uchar: 1; 5 value "thumbscroll_enable" uchar: 1;
@@ -97,6 +97,7 @@ group "Elm_Config" struct {
97 value "win_auto_focus_enable" uchar: 1; 97 value "win_auto_focus_enable" uchar: 1;
98 value "win_auto_focus_animate" uchar: 1; 98 value "win_auto_focus_animate" uchar: 1;
99 value "transition_duration_factor" double: 1.0; 99 value "transition_duration_factor" double: 1.0;
100 value "naviframe_prev_btn_auto_pushed" uchar: 1;
100 group "color_palette" list { 101 group "color_palette" list {
101 group "Elm_Custom_Palette" struct { 102 group "Elm_Custom_Palette" struct {
102 value "palette_name" string: "default"; 103 value "palette_name" string: "default";
diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in
index c18e2db23..8c65a8b2f 100644
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131076; 2 value "config_version" int: 131077;
3 value "engine" string: ""; 3 value "engine" string: "";
4 value "vsync" uchar: 0; 4 value "vsync" uchar: 0;
5 value "thumbscroll_enable" uchar: 1; 5 value "thumbscroll_enable" uchar: 1;
@@ -101,6 +101,7 @@ group "Elm_Config" struct {
101 value "win_auto_focus_enable" uchar: 1; 101 value "win_auto_focus_enable" uchar: 1;
102 value "win_auto_focus_animate" uchar: 1; 102 value "win_auto_focus_animate" uchar: 1;
103 value "transition_duration_factor" double: 1.0; 103 value "transition_duration_factor" double: 1.0;
104 value "naviframe_prev_btn_auto_pushed" uchar: 1;
104 group "color_palette" list { 105 group "color_palette" list {
105 group "Elm_Custom_Palette" struct { 106 group "Elm_Custom_Palette" struct {
106 value "palette_name" string: "default"; 107 value "palette_name" string: "default";
diff --git a/config/standard/base.src.in b/config/standard/base.src.in
index 3f4c0a526..38a9fb5b2 100644
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131076; 2 value "config_version" int: 131077;
3 value "engine" string: ""; 3 value "engine" string: "";
4 value "vsync" uchar: 0; 4 value "vsync" uchar: 0;
5 value "thumbscroll_enable" uchar: 0; 5 value "thumbscroll_enable" uchar: 0;
@@ -98,6 +98,7 @@ group "Elm_Config" struct {
98 value "win_auto_focus_enable" uchar: 1; 98 value "win_auto_focus_enable" uchar: 1;
99 value "win_auto_focus_animate" uchar: 1; 99 value "win_auto_focus_animate" uchar: 1;
100 value "transition_duration_factor" double: 1.0; 100 value "transition_duration_factor" double: 1.0;
101 value "naviframe_prev_btn_auto_pushed" uchar: 1;
101 group "color_palette" list { 102 group "color_palette" list {
102 group "Elm_Custom_Palette" struct { 103 group "Elm_Custom_Palette" struct {
103 value "palette_name" string: "default"; 104 value "palette_name" string: "default";
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 797916184..c9765e2f5 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1380,7 +1380,7 @@ _elm_naviframe_evas_object_smart_add(Eo *obj, Elm_Naviframe_Data *priv)
1380 priv->dummy_edje = wd->resize_obj; 1380 priv->dummy_edje = wd->resize_obj;
1381 evas_object_smart_member_add(priv->dummy_edje, obj); 1381 evas_object_smart_member_add(priv->dummy_edje, obj);
1382 1382
1383 priv->auto_pushed = EINA_TRUE; 1383 priv->auto_pushed = _elm_config->naviframe_prev_btn_auto_pushed;
1384 priv->freeze_events = EINA_TRUE; 1384 priv->freeze_events = EINA_TRUE;
1385 1385
1386 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 1386 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 8a355aa33..d65c7ab56 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -434,6 +434,7 @@ _desc_init(void)
434 ELM_CONFIG_VAL(D, T, win_auto_focus_enable, T_UCHAR); 434 ELM_CONFIG_VAL(D, T, win_auto_focus_enable, T_UCHAR);
435 ELM_CONFIG_VAL(D, T, win_auto_focus_animate, T_UCHAR); 435 ELM_CONFIG_VAL(D, T, win_auto_focus_animate, T_UCHAR);
436 ELM_CONFIG_VAL(D, T, transition_duration_factor, T_DOUBLE); 436 ELM_CONFIG_VAL(D, T, transition_duration_factor, T_DOUBLE);
437 ELM_CONFIG_VAL(D, T, naviframe_prev_btn_auto_pushed, T_UCHAR);
437#undef T 438#undef T
438#undef D 439#undef D
439#undef T_INT 440#undef T_INT
@@ -1462,6 +1463,7 @@ _config_load(void)
1462 _elm_config->gl_msaa = 0; 1463 _elm_config->gl_msaa = 0;
1463 _elm_config->gl_stencil = 0; 1464 _elm_config->gl_stencil = 0;
1464 _elm_config->transition_duration_factor = 1.0; 1465 _elm_config->transition_duration_factor = 1.0;
1466 _elm_config->naviframe_prev_btn_auto_pushed = EINA_TRUE;
1465} 1467}
1466 1468
1467static void 1469static void
@@ -1779,6 +1781,11 @@ _config_update(void)
1779 } 1781 }
1780 } 1782 }
1781 IFCFGEND 1783 IFCFGEND
1784
1785 IFCFG(0x0005)
1786 _elm_config->naviframe_prev_btn_auto_pushed = tcfg->naviframe_prev_btn_auto_pushed;
1787 IFCFGEND
1788
1782 /** 1789 /**
1783 * Fix user config for current ELM_CONFIG_EPOCH here. 1790 * Fix user config for current ELM_CONFIG_EPOCH here.
1784 **/ 1791 **/
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index c9a641b21..61bba21cb 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -123,7 +123,7 @@ struct _Elm_Theme
123 * the users config doesn't need to be wiped - simply new values need 123 * the users config doesn't need to be wiped - simply new values need
124 * to be put in 124 * to be put in
125 */ 125 */
126#define ELM_CONFIG_FILE_GENERATION 0x0004 126#define ELM_CONFIG_FILE_GENERATION 0x0005
127#define ELM_CONFIG_VERSION_EPOCH_OFFSET 16 127#define ELM_CONFIG_VERSION_EPOCH_OFFSET 16
128#define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \ 128#define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
129 ELM_CONFIG_FILE_GENERATION) 129 ELM_CONFIG_FILE_GENERATION)
@@ -293,6 +293,7 @@ struct _Elm_Config
293 unsigned char win_auto_focus_enable; 293 unsigned char win_auto_focus_enable;
294 unsigned char win_auto_focus_animate; 294 unsigned char win_auto_focus_animate;
295 double transition_duration_factor; 295 double transition_duration_factor;
296 unsigned char naviframe_prev_btn_auto_pushed;
296 Eina_List *bindings; 297 Eina_List *bindings;
297 Eina_Bool atspi_mode; 298 Eina_Bool atspi_mode;
298 int gl_depth; 299 int gl_depth;