forked from enlightenment/efl
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
This commit is contained in:
parent
382520fda4
commit
f85bb6bc9a
|
@ -143,12 +143,16 @@ EOLIAN static Eina_Error
|
||||||
_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
|
_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 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));
|
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
|
||||||
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
|
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
|
||||||
|
|
||||||
_mirrored_set(obj, efl_ui_mirrored_get(obj));
|
_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);
|
if (sd->block_events) _block_events_theme_apply(obj);
|
||||||
|
|
||||||
edje_object_scale_set
|
edje_object_scale_set
|
||||||
|
@ -156,7 +160,11 @@ _elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
|
||||||
|
|
||||||
_sizing_eval(obj);
|
_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... */
|
/* Legacy compat. Note that notify has no text parts in the default theme... */
|
||||||
|
|
Loading…
Reference in New Issue