jaehyun pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=81ef39c393ad07eafaaab6d1eeecf14c4e912b6d

commit 81ef39c393ad07eafaaab6d1eeecf14c4e912b6d
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date:   Thu Aug 6 14:59:06 2015 +0900

    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
---
 config/default/base.src.in  | 3 ++-
 config/mobile/base.src.in   | 3 ++-
 config/standard/base.src.in | 3 ++-
 src/lib/elc_naviframe.c     | 2 +-
 src/lib/elm_config.c        | 7 +++++++
 src/lib/elm_priv.h          | 3 ++-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/config/default/base.src.in b/config/default/base.src.in
index 10257ee..f3b741e 100644
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131076;
+  value "config_version" int: 131077;
   value "engine" string: "";
   value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 1;
@@ -97,6 +97,7 @@ group "Elm_Config" struct {
   value "win_auto_focus_enable" uchar: 1;
   value "win_auto_focus_animate" uchar: 1;
   value "transition_duration_factor" double: 1.0;
+  value "naviframe_prev_btn_auto_pushed" uchar: 1;
   group "color_palette" list {
      group "Elm_Custom_Palette" struct {
         value "palette_name" string: "default";
diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in
index c18e2db..8c65a8b 100644
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131076;
+  value "config_version" int: 131077;
   value "engine" string: "";
   value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 1;
@@ -101,6 +101,7 @@ group "Elm_Config" struct {
   value "win_auto_focus_enable" uchar: 1;
   value "win_auto_focus_animate" uchar: 1;
   value "transition_duration_factor" double: 1.0;
+  value "naviframe_prev_btn_auto_pushed" uchar: 1;
   group "color_palette" list {
      group "Elm_Custom_Palette" struct {
         value "palette_name" string: "default";
diff --git a/config/standard/base.src.in b/config/standard/base.src.in
index 3f4c0a5..38a9fb5 100644
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131076;
+  value "config_version" int: 131077;
   value "engine" string: "";
   value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 0;
@@ -98,6 +98,7 @@ group "Elm_Config" struct {
   value "win_auto_focus_enable" uchar: 1;
   value "win_auto_focus_animate" uchar: 1;
   value "transition_duration_factor" double: 1.0;
+  value "naviframe_prev_btn_auto_pushed" uchar: 1;
   group "color_palette" list {
      group "Elm_Custom_Palette" struct {
         value "palette_name" string: "default";
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 7979161..c9765e2 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)
    priv->dummy_edje = wd->resize_obj;
    evas_object_smart_member_add(priv->dummy_edje, obj);
 
-   priv->auto_pushed = EINA_TRUE;
+   priv->auto_pushed = _elm_config->naviframe_prev_btn_auto_pushed;
    priv->freeze_events = EINA_TRUE;
 
    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 8a355aa..d65c7ab 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -434,6 +434,7 @@ _desc_init(void)
    ELM_CONFIG_VAL(D, T, win_auto_focus_enable, T_UCHAR);
    ELM_CONFIG_VAL(D, T, win_auto_focus_animate, T_UCHAR);
    ELM_CONFIG_VAL(D, T, transition_duration_factor, T_DOUBLE);
+   ELM_CONFIG_VAL(D, T, naviframe_prev_btn_auto_pushed, T_UCHAR);
 #undef T
 #undef D
 #undef T_INT
@@ -1462,6 +1463,7 @@ _config_load(void)
    _elm_config->gl_msaa = 0;
    _elm_config->gl_stencil = 0;
    _elm_config->transition_duration_factor = 1.0;
+   _elm_config->naviframe_prev_btn_auto_pushed = EINA_TRUE;
 }
 
 static void
@@ -1779,6 +1781,11 @@ _config_update(void)
            }
      }
    IFCFGEND
+
+   IFCFG(0x0005)
+   _elm_config->naviframe_prev_btn_auto_pushed = 
tcfg->naviframe_prev_btn_auto_pushed;
+   IFCFGEND
+
    /**
     * Fix user config for current ELM_CONFIG_EPOCH here.
     **/
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index c9a641b..61bba21 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -123,7 +123,7 @@ struct _Elm_Theme
  * the users config doesn't need to be wiped - simply new values need
  * to be put in
  */
-#define ELM_CONFIG_FILE_GENERATION 0x0004
+#define ELM_CONFIG_FILE_GENERATION 0x0005
 #define ELM_CONFIG_VERSION_EPOCH_OFFSET 16
 #define ELM_CONFIG_VERSION         ((ELM_CONFIG_EPOCH << 
ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
                                     ELM_CONFIG_FILE_GENERATION)
@@ -293,6 +293,7 @@ struct _Elm_Config
    unsigned char win_auto_focus_enable;
    unsigned char win_auto_focus_animate;
    double        transition_duration_factor;
+   unsigned char naviframe_prev_btn_auto_pushed;
    Eina_List    *bindings;
    Eina_Bool     atspi_mode;
    int           gl_depth;

-- 


Reply via email to