[EGIT] [core/efl] master 01/01: efl_ui_layout: Eina_Error type has been modified to work correctly.

[Taehyub Kim]

jaehyun pushed a commit to branch master.

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

commit bb81ccdac13c4529cff4fd6f5b5df337fa83b262
Author: Taehyub Kim <taehyub....@samsung.com>
Date:   Fri Mar 22 12:38:44 2019 +0900

    efl_ui_layout: Eina_Error type has been modified to work correctly.
    
    Summary:
    fix Eina_Error type calculation in 
_efl_ui_layout_base_efl_ui_widget_theme_apply() to behave as before.
    
    @fix
    
    Test Plan: run elementary_test for all widgets
    
    Reviewers: #reviewers, Jaehyun_Cho, Hermet
    
    Reviewed By: Jaehyun_Cho
    
    Subscribers: cedric, #committers
    
    Tags: #efl
    
    Differential Revision: https://phab.enlightenment.org/D8443
---
 src/lib/elementary/efl_ui_layout.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lib/elementary/efl_ui_layout.c 
b/src/lib/elementary/efl_ui_layout.c
index 8f9c63333c..9ba90026a9 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -474,13 +474,20 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data 
*sd)
 EOLIAN static Eina_Error
 _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
 {
-   Eina_Error theme_apply_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
+   Eina_Error theme_apply_ret, theme_apply_internal_ret;
 
    theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return 
EFL_UI_THEME_APPLY_ERROR_GENERIC;
 
-   theme_apply_ret &= _efl_ui_layout_theme_internal(obj, sd);
-   return theme_apply_ret;
+   theme_apply_internal_ret = _efl_ui_layout_theme_internal(obj, sd);
+   if (theme_apply_internal_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
+     return EFL_UI_THEME_APPLY_ERROR_GENERIC;
+
+   if ((theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT) ||
+       (theme_apply_internal_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT))
+     return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
+
+   return EFL_UI_THEME_APPLY_ERROR_NONE;
 }
 
 EOLIAN static Eina_Bool

--