forked from enlightenment/efl
Revert "elm: do not call "changed" callback when setting style"
This reverts commit b1ee35e35c
.
This commit is contained in:
parent
23877f2c44
commit
5d5538de5c
|
@ -19,6 +19,7 @@ typedef struct
|
||||||
} Efl_Ui_Nstate_Data;
|
} Efl_Ui_Nstate_Data;
|
||||||
|
|
||||||
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
|
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
|
||||||
|
static void _state_active(Evas_Object *obj, Efl_Ui_Nstate_Data *sd);
|
||||||
|
|
||||||
static const Elm_Action key_actions[] = {
|
static const Elm_Action key_actions[] = {
|
||||||
{"activate", _key_action_activate},
|
{"activate", _key_action_activate},
|
||||||
|
@ -115,13 +116,15 @@ _efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Nstate_Data *pd, int state)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Ui_Theme_Apply
|
EOLIAN static Efl_Ui_Theme_Apply
|
||||||
_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
|
_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
|
||||||
{
|
{
|
||||||
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
|
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
|
||||||
|
|
||||||
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) return EFL_UI_THEME_APPLY_FAILED;
|
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
|
||||||
|
|
||||||
|
_state_active(obj, pd);
|
||||||
|
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue