From b58f8b5e0de082dd4d4379a2c0a9fbb2704778d9 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Fri, 15 Nov 2019 15:56:04 +0900 Subject: [PATCH] Revert "efl_ui/layout: selectively inhibit theme,changed event" This reverts commit 6ed8c7653e87da4f81da5a21c3b942e9fa0f828e. This patch is under discussion whether or not to revert from open source. @tizen_only @tizen_fix Change-Id: Icfe948cfee17242e6f433656268f33b00625613e --- src/lib/elementary/efl_ui_layout.c | 30 +----------------------------- src/lib/elementary/elm_widget_layout.h | 1 - 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 12c7696..0113c37 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -621,10 +621,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd, Elm_Widget_Smart_ } if (ret != EFL_UI_THEME_APPLY_ERROR_GENERIC) - { - if (sd->cb_theme_changed) - efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); - } + efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); if (!_visuals_refresh(obj, sd)) ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; @@ -3239,29 +3236,6 @@ _efl_ui_layout_base_theme_rotation_apply(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UN /* Internal EO APIs and hidden overrides */ -EOLIAN static Eina_Bool -_efl_ui_layout_base_efl_object_event_callback_priority_add(Eo *obj, Efl_Ui_Layout_Data *pd, const Efl_Event_Description *desc, Efl_Callback_Priority priority, Efl_Event_Cb func, const void *user_data) -{ - if (desc == EFL_CANVAS_GROUP_EVENT_MEMBER_ADDED) - { - pd->cb_theme_changed = EINA_TRUE; - } - - return efl_event_callback_priority_add(efl_super(obj, MY_CLASS), desc, priority, func, user_data); -} - -EOLIAN static Eina_Bool -_efl_ui_layout_base_efl_object_event_callback_array_priority_add(Eo *obj, Efl_Ui_Layout_Data *pd, const Efl_Callback_Array_Item *array, Efl_Callback_Priority priority, const void *user_data) -{ - for (int i = 0; array[i].desc; ++i) - { - if (array[i].desc == EFL_CANVAS_GROUP_EVENT_MEMBER_ADDED) - { - pd->cb_theme_changed = EINA_TRUE; - } - } - return efl_event_callback_array_priority_add(efl_super(obj, MY_CLASS), array, priority, user_data); -} EFL_FUNC_BODY_CONST(efl_ui_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) EFL_FUNC_BODY_CONST(efl_ui_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) @@ -3275,8 +3249,6 @@ EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout_base), \ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ - EFL_OBJECT_OP_FUNC(efl_event_callback_priority_add, _efl_ui_layout_base_efl_object_event_callback_priority_add), \ - EFL_OBJECT_OP_FUNC(efl_event_callback_array_priority_add, _efl_ui_layout_base_efl_object_event_callback_array_priority_add), \ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_base_efl_object_dbg_info_get) diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h index 4cea96f..aa235a1 100644 --- a/src/lib/elementary/elm_widget_layout.h +++ b/src/lib/elementary/elm_widget_layout.h @@ -75,7 +75,6 @@ typedef struct _Efl_Ui_Layout_Data Eina_Bool model_bound : 1; /**< Set to true once we are watching over a model*/ Eina_Bool model_watch : 1; /**< Set to true once we do watch for model change*/ Eina_Bool calc_subobjs : 1; /**< Set to true if group_calc should also handle subobjs during manual calc */ - Eina_Bool cb_theme_changed : 1; /**< if theme,changed event subscriber has been added */ } Efl_Ui_Layout_Data; typedef struct _Elm_Layout_Data -- 2.7.4