From f85bb6bc9a45b6e1114fee8bf40d1bb49ee4040f Mon Sep 17 00:00:00 2001 From: Taehyub Kim Date: Wed, 17 Apr 2019 16:59:24 +0900 Subject: [PATCH] elm_notify: fix theme apply logic for new return value Summary: fix theme apply logic for new return value Test Plan: 1. run elementary_test for elm_notify and elm_popup Reviewers: Jaehyun_Cho, woohyun Reviewed By: Jaehyun_Cho Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8628 --- src/lib/elementary/elm_notify.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 8a98c32f9b..df9899722d 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -143,12 +143,16 @@ EOLIAN static Eina_Error _elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) { Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error notify_theme_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; _mirrored_set(obj, efl_ui_mirrored_get(obj)); - int_ret &= _notify_theme_apply(obj); + notify_theme_ret = _notify_theme_apply(obj); + if (notify_theme_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) + return notify_theme_ret; + if (sd->block_events) _block_events_theme_apply(obj); edje_object_scale_set @@ -156,7 +160,11 @@ _elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) _sizing_eval(obj); - return int_ret; + if ((int_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT) || + (notify_theme_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT)) + return EFL_UI_THEME_APPLY_ERROR_DEFAULT; + + return EFL_UI_THEME_APPLY_ERROR_NONE; } /* Legacy compat. Note that notify has no text parts in the default theme... */