summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaehyub Kim <taehyub.kim@samsung.com>2019-04-17 16:59:24 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-04-17 16:59:24 +0900
commitf85bb6bc9a45b6e1114fee8bf40d1bb49ee4040f (patch)
tree62d6181d146eb3c89ec37014ad4fb1876406ec95
parent382520fda450f22f0256b3a57a9b90c4d49e7cca (diff)
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
-rw-r--r--src/lib/elementary/elm_notify.c12
1 files 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
143_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) 143_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
144{ 144{
145 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 145 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
146 Eina_Error notify_theme_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
146 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 147 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
147 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 148 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
148 149
149 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 150 _mirrored_set(obj, efl_ui_mirrored_get(obj));
150 151
151 int_ret &= _notify_theme_apply(obj); 152 notify_theme_ret = _notify_theme_apply(obj);
153 if (notify_theme_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
154 return notify_theme_ret;
155
152 if (sd->block_events) _block_events_theme_apply(obj); 156 if (sd->block_events) _block_events_theme_apply(obj);
153 157
154 edje_object_scale_set 158 edje_object_scale_set
@@ -156,7 +160,11 @@ _elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
156 160
157 _sizing_eval(obj); 161 _sizing_eval(obj);
158 162
159 return int_ret; 163 if ((int_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT) ||
164 (notify_theme_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT))
165 return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
166
167 return EFL_UI_THEME_APPLY_ERROR_NONE;
160} 168}
161 169
162/* Legacy compat. Note that notify has no text parts in the default theme... */ 170/* Legacy compat. Note that notify has no text parts in the default theme... */