kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Taehyub Kim 2019-03-22 12:38:44 +09:00 committed by Jaehyun Cho
parent 0881d1524b
commit bb81ccdac1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/elementary/efl_ui_layout.c
View File

@ -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