diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 5d089bd775..5a55e0aca2 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -5160,7 +5160,7 @@ _efl_ui_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, /* Legacy APIs */ EAPI void -elm_widget_on_show_region_hook_set(Eo *obj, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb func_free_cb) +elm_widget_on_show_region_hook_set(Eo *obj, void *data, Elm_Widget_On_Show_Region_Cb func, Eina_Free_Cb func_free_cb) { ELM_WIDGET_DATA_GET(obj, sd); diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index 29aa9e4bc6..3c892dac04 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -1,11 +1,3 @@ -function @beta Efl.Ui.Scrollable_On_Show_Region { - [[Function pointer for on show region hook]] - params { - @in obj: Efl.Canvas.Object; [[Canvas object]] - @in region: Eina.Rect; [[Showed region]] - } -}; - struct Efl.Ui.Widget_Focus_State { [[All relevant fields needed for the current state of focus registration @since 1.22 diff --git a/src/lib/elementary/efl_ui_widget_eo.legacy.h b/src/lib/elementary/efl_ui_widget_eo.legacy.h index 70ae62e88b..e4fb297628 100644 --- a/src/lib/elementary/efl_ui_widget_eo.legacy.h +++ b/src/lib/elementary/efl_ui_widget_eo.legacy.h @@ -11,12 +11,6 @@ typedef Eo Efl_Ui_Widget; #ifndef _EFL_UI_WIDGET_EO_TYPES #define _EFL_UI_WIDGET_EO_TYPES -/** Function pointer for on show region hook - * - * @ingroup Efl_Ui - */ -typedef void (*Efl_Ui_Scrollable_On_Show_Region)(void *data, Efl_Canvas_Object *obj, Eina_Rect region); - /** All relevant fields needed for the current state of focus registeration * * @ingroup Efl_Ui diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index c2a9474d17..cda2196067 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -303,6 +303,8 @@ typedef Eina_Bool (*Elm_Widget_Del_Pre_Cb)(void *data); typedef void (*Elm_Widget_Item_Signal_Cb)(void *data, Elm_Object_Item *item, const char *emission, const char *source); typedef void (*Elm_Access_On_Highlight_Cb)(void *data); +typedef void (*Elm_Widget_On_Show_Region_Cb)(void *data, Evas_Object *obj, Eina_Rect region); + #include "efl_ui_widget.eo.h" #include "elm_widget_item_container_eo.h" @@ -359,7 +361,7 @@ typedef struct _Elm_Widget_Smart_Data * handling the request of showing a specific region from an inner * widget (mainly issued by entries, on cursor moving) */ void *on_show_region_data; - Efl_Ui_Scrollable_On_Show_Region on_show_region; + Elm_Widget_On_Show_Region_Cb on_show_region; Eina_Free_Cb on_show_region_data_free; Elm_Focus_Move_Policy focus_move_policy; @@ -587,7 +589,7 @@ EAPI Eina_Bool elm_widget_api_check(int ver); EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access); EAPI Eina_Error elm_widget_theme(Evas_Object *obj); EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); -EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb data_free); +EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void *data, Elm_Widget_On_Show_Region_Cb func, Eina_Free_Cb data_free); EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj); EAPI Eina_Bool elm_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj); EAPI Eina_Bool elm_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj);