zmike pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=10b2f65e606594616abc1acf2dd9db1277ed145c

commit 10b2f65e606594616abc1acf2dd9db1277ed145c
Author: subhransu mohanty <sub.moha...@samsung.com>
Date:   Thu Aug 22 08:14:13 2019 -0400

    elm/config: avoid unnecessary elm cache flush
    
    Summary:
    in config_apply() we load the deafult theme and then
    elm_recache() just throws it away.
    
    so just move it before config_apply for time being.
    We need to revisit to check if we really need that elm_recache() in that
    function or not.
    
    Reviewers: Hermet, raster, cedric, zmike
    
    Reviewed By: zmike
    
    Subscribers: zmike, cedric, #reviewers, #committers
    
    Tags: #efl
    
    Differential Revision: https://phab.enlightenment.org/D9700
---
 src/lib/elementary/elm_config.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 5344f6681a..5624f0b125 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -2033,6 +2033,7 @@ _config_flush_get(void)
    _elm_config->is_mirrored = is_mirrored;
    _elm_config->translate = translate;
 
+   _elm_recache();
    _config_apply();
    _config_sub_apply();
    evas_font_reinit();
@@ -2040,7 +2041,6 @@ _config_flush_get(void)
    _elm_config_color_overlay_apply();
    if (pre_scale != _elm_config->scale)
      _elm_rescale();
-   _elm_recache();
    _elm_old_clouseau_reload();
    _elm_config_key_binding_hash();
    _elm_win_access(_elm_config->access_mode);
@@ -4218,10 +4218,10 @@ _elm_config_init(void)
    ELM_SAFE_FREE(_elm_accel_preference, eina_stringshare_del);
    ELM_SAFE_FREE(_elm_gl_preference, eina_stringshare_del);
    _translation_init();
+   _elm_recache();
    _config_apply();
    _elm_config_font_overlay_apply();
    _elm_config_color_overlay_apply();
-   _elm_recache();
    _elm_old_clouseau_reload();
    _elm_config_key_binding_hash();
 }
@@ -4402,6 +4402,7 @@ _elm_config_reload(void)
    _elm_config->is_mirrored = is_mirrored;
    _elm_config->translate = translate;
 
+   _elm_recache();
    _config_apply();
    _elm_config_font_overlay_apply();
    _elm_config_color_overlay_apply();
@@ -4426,7 +4427,6 @@ _elm_config_reload(void)
       )
      _elm_rescale();
 #undef CMP
-   _elm_recache();
    _elm_old_clouseau_reload();
    _elm_config_key_binding_hash();
    ecore_event_add(ELM_EVENT_CONFIG_ALL_CHANGED, NULL, NULL, NULL);
@@ -4703,11 +4703,11 @@ _elm_config_profile_set(const char *profile)
    _elm_config->is_mirrored = is_mirrored;
    _elm_config->translate = translate;
 
+   _elm_recache();
    _config_apply();
    _elm_config_font_overlay_apply();
    _elm_config_color_overlay_apply();
    _elm_rescale();
-   _elm_recache();
    _elm_old_clouseau_reload();
    _elm_config_key_binding_hash();
 }

-- 


Reply via email to