[EGIT] [core/elementary] master 09/11: config: handle is_mirrored, and translate are not part of EET file, when config flush occurs

[Shinwoo Kim]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5087a8f94f71294a20b567fdc518cfadee13dd46

commit 5087a8f94f71294a20b567fdc518cfadee13dd46
Author: Shinwoo Kim <cinoo....@samsung.com>
Date:   Fri Mar 4 16:00:06 2016 -0800

    config: handle is_mirrored, and translate are not part of EET file, when 
config flush occurs
    
    Summary: is_mirrored, and translate value is reset, when config flush 
occurs.
    
    Reviewers: raster, cedric, jpeg, tasn
    
    Subscribers: seoz
    
    Differential Revision: https://phab.enlightenment.org/D3748
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 src/lib/elm_config.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index f958730..185a0ef 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1827,12 +1827,22 @@ _config_load(void)
 static void
 _config_flush_get(void)
 {
+   Eina_Bool is_mirrored;
+   Eina_Bool translate;
+   is_mirrored = _elm_config->is_mirrored;
+   translate = _elm_config->translate;
+
    _elm_config_font_overlays_cancel();
    _color_overlays_cancel();
    _config_free(_elm_config);
    _elm_config = NULL;
    _config_load();
    _env_get();
+
+   /* restore prev value which is not part of the EET file */
+   _elm_config->is_mirrored = is_mirrored;
+   _elm_config->translate = translate;
+
    _config_apply();
    _config_sub_apply();
    evas_font_reinit();
@@ -3673,7 +3683,7 @@ elm_config_all_flush(void)
 }
 
 static void
-_translation_init()
+_translation_init(void)
 {
 #ifdef ENABLE_NLS
    const char *cur_dom = textdomain(NULL);
@@ -3929,9 +3939,19 @@ end:
 void
 _elm_config_reload(void)
 {
+   Eina_Bool is_mirrored;
+   Eina_Bool translate;
+   is_mirrored = _elm_config->is_mirrored;
+   translate = _elm_config->translate;
+
    _config_free(_elm_config);
    _elm_config = NULL;
    _config_load();
+
+   /* restore prev value which is not part of the EET file */
+   _elm_config->is_mirrored = is_mirrored;
+   _elm_config->translate = translate;
+
    _config_apply();
    _elm_config_font_overlay_apply();
    _elm_config_color_overlay_apply();
@@ -4100,6 +4120,11 @@ elm_config_transition_duration_factor_get(void)
 void
 _elm_config_profile_set(const char *profile)
 {
+   Eina_Bool is_mirrored;
+   Eina_Bool translate;
+   is_mirrored = _elm_config->is_mirrored;
+   translate = _elm_config->translate;
+
    if (!profile) return;
 
    if (_elm_profile)
@@ -4116,6 +4141,11 @@ _elm_config_profile_set(const char *profile)
    _config_free(_elm_config);
    _elm_config = NULL;
    _config_load();
+
+   /* restore prev value which is not part of the EET file */
+   _elm_config->is_mirrored = is_mirrored;
+   _elm_config->translate = translate;
+
    _config_apply();
    _elm_config_font_overlay_apply();
    _elm_config_color_overlay_apply();

--