summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaehyub Kim <taehyub.kim@samsung.com>2019-03-22 12:38:44 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-03-22 12:38:44 +0900
commitbb81ccdac13c4529cff4fd6f5b5df337fa83b262 (patch)
tree1b4812fb7aa2af1b6840bb63eb699455f33fe7bd
parent0881d1524b6d3996a29b68820690f97821116585 (diff)
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
-rw-r--r--src/lib/elementary/efl_ui_layout.c13
1 files 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)
474EOLIAN static Eina_Error 474EOLIAN static Eina_Error
475_efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) 475_efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
476{ 476{
477 Eina_Error theme_apply_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 477 Eina_Error theme_apply_ret, theme_apply_internal_ret;
478 478
479 theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 479 theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
480 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC; 480 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
481 481
482 theme_apply_ret &= _efl_ui_layout_theme_internal(obj, sd); 482 theme_apply_internal_ret = _efl_ui_layout_theme_internal(obj, sd);
483 return theme_apply_ret; 483 if (theme_apply_internal_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
484 return EFL_UI_THEME_APPLY_ERROR_GENERIC;
485
486 if ((theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT) ||
487 (theme_apply_internal_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT))
488 return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
489
490 return EFL_UI_THEME_APPLY_ERROR_NONE;
484} 491}
485 492
486EOLIAN static Eina_Bool 493EOLIAN static Eina_Bool