summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinwoo Kim <cinoo.kim@samsung.com>2016-03-04 16:00:06 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-03-04 16:14:37 -0800
commit5087a8f94f71294a20b567fdc518cfadee13dd46 (patch)
treed9a1eca8c6064a99629139d942461b6ae81d0c3e
parent23aa206fe1218d1ef060b2bdaf558b1f4a802153 (diff)
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 <cedric@osg.samsung.com>
-rw-r--r--src/lib/elm_config.c32
1 files changed, 31 insertions, 1 deletions
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index f958730b3..185a0ef4e 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1827,12 +1827,22 @@ _config_load(void)
1827static void 1827static void
1828_config_flush_get(void) 1828_config_flush_get(void)
1829{ 1829{
1830 Eina_Bool is_mirrored;
1831 Eina_Bool translate;
1832 is_mirrored = _elm_config->is_mirrored;
1833 translate = _elm_config->translate;
1834
1830 _elm_config_font_overlays_cancel(); 1835 _elm_config_font_overlays_cancel();
1831 _color_overlays_cancel(); 1836 _color_overlays_cancel();
1832 _config_free(_elm_config); 1837 _config_free(_elm_config);
1833 _elm_config = NULL; 1838 _elm_config = NULL;
1834 _config_load(); 1839 _config_load();
1835 _env_get(); 1840 _env_get();
1841
1842 /* restore prev value which is not part of the EET file */
1843 _elm_config->is_mirrored = is_mirrored;
1844 _elm_config->translate = translate;
1845
1836 _config_apply(); 1846 _config_apply();
1837 _config_sub_apply(); 1847 _config_sub_apply();
1838 evas_font_reinit(); 1848 evas_font_reinit();
@@ -3673,7 +3683,7 @@ elm_config_all_flush(void)
3673} 3683}
3674 3684
3675static void 3685static void
3676_translation_init() 3686_translation_init(void)
3677{ 3687{
3678#ifdef ENABLE_NLS 3688#ifdef ENABLE_NLS
3679 const char *cur_dom = textdomain(NULL); 3689 const char *cur_dom = textdomain(NULL);
@@ -3929,9 +3939,19 @@ end:
3929void 3939void
3930_elm_config_reload(void) 3940_elm_config_reload(void)
3931{ 3941{
3942 Eina_Bool is_mirrored;
3943 Eina_Bool translate;
3944 is_mirrored = _elm_config->is_mirrored;
3945 translate = _elm_config->translate;
3946
3932 _config_free(_elm_config); 3947 _config_free(_elm_config);
3933 _elm_config = NULL; 3948 _elm_config = NULL;
3934 _config_load(); 3949 _config_load();
3950
3951 /* restore prev value which is not part of the EET file */
3952 _elm_config->is_mirrored = is_mirrored;
3953 _elm_config->translate = translate;
3954
3935 _config_apply(); 3955 _config_apply();
3936 _elm_config_font_overlay_apply(); 3956 _elm_config_font_overlay_apply();
3937 _elm_config_color_overlay_apply(); 3957 _elm_config_color_overlay_apply();
@@ -4100,6 +4120,11 @@ elm_config_transition_duration_factor_get(void)
4100void 4120void
4101_elm_config_profile_set(const char *profile) 4121_elm_config_profile_set(const char *profile)
4102{ 4122{
4123 Eina_Bool is_mirrored;
4124 Eina_Bool translate;
4125 is_mirrored = _elm_config->is_mirrored;
4126 translate = _elm_config->translate;
4127
4103 if (!profile) return; 4128 if (!profile) return;
4104 4129
4105 if (_elm_profile) 4130 if (_elm_profile)
@@ -4116,6 +4141,11 @@ _elm_config_profile_set(const char *profile)
4116 _config_free(_elm_config); 4141 _config_free(_elm_config);
4117 _elm_config = NULL; 4142 _elm_config = NULL;
4118 _config_load(); 4143 _config_load();
4144
4145 /* restore prev value which is not part of the EET file */
4146 _elm_config->is_mirrored = is_mirrored;
4147 _elm_config->translate = translate;
4148
4119 _config_apply(); 4149 _config_apply();
4120 _elm_config_font_overlay_apply(); 4150 _elm_config_font_overlay_apply();
4121 _elm_config_color_overlay_apply(); 4151 _elm_config_color_overlay_apply();