summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2019-09-10 09:09:00 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-09-10 09:16:48 -0400
commit37a63fb1ee30e453d7eb1b513be31c9f736f3bf9 (patch)
tree7abd18bf3eee9ac6dd1b8a3dea73b5d17d353035
parentafc011d8931006bd020ba5130a581580f709edcf (diff)
efl_ui_widget: make Efl_Ui_Scrollable_On_Show_Region legacy
Summary: `Efl_Ui_Scrollable_On_Show_Region` is only used for legacy EAPI. it moved to elm_widget.h from eo file. also, it renamed `Elm_Widget_On_Show_Region_Cb`. Reviewers: Jaehyun_Cho, zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9896
-rw-r--r--src/lib/elementary/efl_ui_widget.c2
-rw-r--r--src/lib/elementary/efl_ui_widget.eo8
-rw-r--r--src/lib/elementary/efl_ui_widget_eo.legacy.h6
-rw-r--r--src/lib/elementary/elm_widget.h6
4 files changed, 5 insertions, 17 deletions
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,
5160/* Legacy APIs */ 5160/* Legacy APIs */
5161 5161
5162EAPI void 5162EAPI void
5163elm_widget_on_show_region_hook_set(Eo *obj, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb func_free_cb) 5163elm_widget_on_show_region_hook_set(Eo *obj, void *data, Elm_Widget_On_Show_Region_Cb func, Eina_Free_Cb func_free_cb)
5164{ 5164{
5165 ELM_WIDGET_DATA_GET(obj, sd); 5165 ELM_WIDGET_DATA_GET(obj, sd);
5166 5166
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 @@
1function @beta Efl.Ui.Scrollable_On_Show_Region {
2 [[Function pointer for on show region hook]]
3 params {
4 @in obj: Efl.Canvas.Object; [[Canvas object]]
5 @in region: Eina.Rect; [[Showed region]]
6 }
7};
8
9struct Efl.Ui.Widget_Focus_State { 1struct Efl.Ui.Widget_Focus_State {
10 [[All relevant fields needed for the current state of focus registration 2 [[All relevant fields needed for the current state of focus registration
11 @since 1.22 3 @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;
11#ifndef _EFL_UI_WIDGET_EO_TYPES 11#ifndef _EFL_UI_WIDGET_EO_TYPES
12#define _EFL_UI_WIDGET_EO_TYPES 12#define _EFL_UI_WIDGET_EO_TYPES
13 13
14/** Function pointer for on show region hook
15 *
16 * @ingroup Efl_Ui
17 */
18typedef void (*Efl_Ui_Scrollable_On_Show_Region)(void *data, Efl_Canvas_Object *obj, Eina_Rect region);
19
20/** All relevant fields needed for the current state of focus registeration 14/** All relevant fields needed for the current state of focus registeration
21 * 15 *
22 * @ingroup Efl_Ui 16 * @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);
303typedef void (*Elm_Widget_Item_Signal_Cb)(void *data, Elm_Object_Item *item, const char *emission, const char *source); 303typedef void (*Elm_Widget_Item_Signal_Cb)(void *data, Elm_Object_Item *item, const char *emission, const char *source);
304 304
305typedef void (*Elm_Access_On_Highlight_Cb)(void *data); 305typedef void (*Elm_Access_On_Highlight_Cb)(void *data);
306typedef void (*Elm_Widget_On_Show_Region_Cb)(void *data, Evas_Object *obj, Eina_Rect region);
307
306 308
307#include "efl_ui_widget.eo.h" 309#include "efl_ui_widget.eo.h"
308#include "elm_widget_item_container_eo.h" 310#include "elm_widget_item_container_eo.h"
@@ -359,7 +361,7 @@ typedef struct _Elm_Widget_Smart_Data
359 * handling the request of showing a specific region from an inner 361 * handling the request of showing a specific region from an inner
360 * widget (mainly issued by entries, on cursor moving) */ 362 * widget (mainly issued by entries, on cursor moving) */
361 void *on_show_region_data; 363 void *on_show_region_data;
362 Efl_Ui_Scrollable_On_Show_Region on_show_region; 364 Elm_Widget_On_Show_Region_Cb on_show_region;
363 Eina_Free_Cb on_show_region_data_free; 365 Eina_Free_Cb on_show_region_data_free;
364 366
365 Elm_Focus_Move_Policy focus_move_policy; 367 Elm_Focus_Move_Policy focus_move_policy;
@@ -587,7 +589,7 @@ EAPI Eina_Bool elm_widget_api_check(int ver);
587EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access); 589EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access);
588EAPI Eina_Error elm_widget_theme(Evas_Object *obj); 590EAPI Eina_Error elm_widget_theme(Evas_Object *obj);
589EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); 591EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force);
590EAPI 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); 592EAPI 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);
591EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj); 593EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj);
592EAPI Eina_Bool elm_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj); 594EAPI Eina_Bool elm_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj);
593EAPI Eina_Bool elm_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj); 595EAPI Eina_Bool elm_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj);