From 31c4fd1f7c8e9731e9c36903a79db754d94060ee Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 10 Jun 2016 17:51:20 +0900 Subject: [PATCH] Evas: Rename Scrollable_Interface to Efl.Ui.Scrollable --- src/Makefile_Evas.am | 2 +- src/lib/elementary/elm_diskselector.c | 8 ++++---- src/lib/elementary/elm_diskselector.eo | 2 +- src/lib/elementary/elm_entry.c | 2 +- src/lib/elementary/elm_entry.eo | 2 +- src/lib/elementary/elm_gengrid.c | 10 +++++----- src/lib/elementary/elm_genlist.c | 10 +++++----- src/lib/elementary/elm_interface_scrollable.eo | 2 +- src/lib/elementary/elm_map.c | 10 +++++----- src/lib/elementary/elm_panel.c | 2 +- src/lib/elementary/elm_photocam.c | 10 +++++----- src/lib/elementary/elm_photocam.eo | 2 +- src/lib/elementary/elm_scroller.c | 10 +++++----- src/lib/elementary/elm_scroller.eo | 2 +- src/lib/elementary/elm_toolbar.c | 10 +++++----- src/lib/evas/Evas_Eo.h | 9 +-------- src/lib/evas/canvas/common_interfaces.c | 2 +- ...as_scrollable_interface.eo => efl_ui_scrollable.eo} | 3 ++- 18 files changed, 46 insertions(+), 52 deletions(-) rename src/lib/evas/canvas/{evas_scrollable_interface.eo => efl_ui_scrollable.eo} (70%) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index effe85a6d5..e01728b344 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -12,7 +12,7 @@ evas_eolian_pub_files = \ lib/evas/canvas/efl_canvas_image_internal.eo \ lib/evas/canvas/efl_ui_draggable.eo \ lib/evas/canvas/efl_ui_clickable.eo \ - lib/evas/canvas/evas_scrollable_interface.eo \ + lib/evas/canvas/efl_ui_scrollable.eo \ lib/evas/canvas/evas_selectable_interface.eo \ lib/evas/canvas/evas_zoomable_interface.eo \ lib/evas/canvas/evas_canvas3d_camera.eo\ diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index cbe13cb041..f89beda60f 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -1099,7 +1099,7 @@ _scroll_animate_stop_cb(Evas_Object *obj, if (!it) return; _item_select(it); eo_event_callback_call - (data, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)); + (data, EFL_UI_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)); } static void @@ -1107,7 +1107,7 @@ _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj)); + (obj, EFL_UI_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj)); } static void @@ -1115,7 +1115,7 @@ _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj)); + (obj, EFL_UI_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj)); } static void @@ -1123,7 +1123,7 @@ _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj)); + (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj)); } static void diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo index 7c37cff4ff..a72665dcfe 100644 --- a/src/lib/elementary/elm_diskselector.eo +++ b/src/lib/elementary/elm_diskselector.eo @@ -1,6 +1,6 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, Elm.Interface.Atspi_Widget_Action, - Efl.Ui.Clickable, Evas.Scrollable_Interface, + Efl.Ui.Clickable, Efl.Ui.Scrollable, Evas.Selectable_Interface) { legacy_prefix: elm_diskselector; diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index b9f61a9f2e..6c7a2d721e 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -4897,7 +4897,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) ELM_ENTRY_DATA_GET(obj, sd); /* here we need to emit the signal that the elm_scroller would have done */ eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); + (obj, EFL_UI_EVENT_SCROLL, NULL); if (sd->have_selection) _update_selection_handler(obj); diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index a9dc70643b..a291cae119 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -116,7 +116,7 @@ enum Elm.Cnp_Mode class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, - Evas.Selectable_Interface, Evas.Scrollable_Interface) + Evas.Selectable_Interface, Efl.Ui.Scrollable) { legacy_prefix: elm_entry; eo_prefix: elm_obj_entry; diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index f80c313e9b..84e5db946c 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -3872,28 +3872,28 @@ static void _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); } static void _scroll_animate_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); } static void _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); } static void _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); } static void @@ -3935,7 +3935,7 @@ static void _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL); } static int diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 6b4e065f6a..27b860b550 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -5289,35 +5289,35 @@ static void _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); } static void _scroll_animate_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); } static void _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); } static void _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL); } static void _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); } static void diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo index 11dc623215..becf50b045 100644 --- a/src/lib/elementary/elm_interface_scrollable.eo +++ b/src/lib/elementary/elm_interface_scrollable.eo @@ -42,7 +42,7 @@ enum Elm.Scroller.Movement_Block } -mixin Elm.Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object.Smart) +mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Evas.Object.Smart) { eo_prefix: elm_interface_scrollable; data: Elm_Scrollable_Smart_Interface_Data; diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 91f8d9839b..d7d1d6b719 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -1284,7 +1284,7 @@ _scr_timeout_cb(void *data) _smooth_update(sd); sd->scr_timer = NULL; eo_event_callback_call - (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); return ECORE_CALLBACK_CANCEL; } @@ -1298,11 +1298,11 @@ _scroll_cb(Evas_Object *obj, if (sd->scr_timer) ecore_timer_del(sd->scr_timer); else eo_event_callback_call - (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj); eo_event_callback_call - (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL, NULL); } static void @@ -1312,7 +1312,7 @@ _scroll_animate_start_cb(Evas_Object *obj, ELM_MAP_DATA_GET(obj, sd); eo_event_callback_call - (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); } static void @@ -1322,7 +1322,7 @@ _scroll_animate_stop_cb(Evas_Object *obj, ELM_MAP_DATA_GET(obj, sd); eo_event_callback_call - (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); } static Eina_Bool diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 5ccfbdd7a8..88219bb607 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1316,7 +1316,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) break; } eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, (void *) &event); + (obj, EFL_UI_EVENT_SCROLL, (void *) &event); } EOLIAN static Eina_Bool diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 6858bb8796..2ad3904505 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -892,7 +892,7 @@ _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); + (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); } static void @@ -900,7 +900,7 @@ _scroll_animate_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); + (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); } static void @@ -908,7 +908,7 @@ _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); + (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); } static void @@ -916,7 +916,7 @@ _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); + (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); } static void @@ -935,7 +935,7 @@ _scroll_cb(Evas_Object *obj, sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj); eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); + (obj, EFL_UI_EVENT_SCROLL, NULL); } static Eina_Bool diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo index b1ed834338..c064872224 100644 --- a/src/lib/elementary/elm_photocam.eo +++ b/src/lib/elementary/elm_photocam.eo @@ -12,7 +12,7 @@ enum Elm.Photocam.Zoom_Mode class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, Elm.Interface.Atspi_Widget_Action, Efl.File, - Efl.Ui.Clickable, Evas.Scrollable_Interface, + Efl.Ui.Clickable, Efl.Ui.Scrollable, Evas.Zoomable_Interface) { legacy_prefix: elm_photocam; diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 661999a62b..9c4611c63f 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -597,7 +597,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); + (obj, EFL_UI_EVENT_SCROLL, NULL); } static void @@ -633,7 +633,7 @@ _scroll_anim_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); + (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); } static void @@ -641,7 +641,7 @@ _scroll_anim_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); + (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); } static void @@ -649,7 +649,7 @@ _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); + (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); } static void @@ -657,7 +657,7 @@ _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { eo_event_callback_call - (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); + (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); } static void diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index 5c7149dd99..62d2246dce 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -1,6 +1,6 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, Elm.Interface.Atspi_Widget_Action, - Evas.Scrollable_Interface) + Efl.Ui.Scrollable) { legacy_prefix: elm_scroller; eo_prefix: elm_obj_scroller; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index dd9f1068f0..8543f2cbb3 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -2305,21 +2305,21 @@ static void _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL); } static void _scroll_anim_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); } static void _scroll_anim_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); } static void @@ -2329,14 +2329,14 @@ _scroll_drag_start_cb(Evas_Object *obj, ELM_TOOLBAR_DATA_GET(obj, sd); ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); } static void _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); + eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); } static void diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 7b3b02f50c..465972ca9a 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -4,17 +4,10 @@ #include "canvas/efl_ui_draggable.eo.h" #include "canvas/efl_ui_clickable.eo.h" -#include "canvas/evas_scrollable_interface.eo.h" +#include "canvas/efl_ui_scrollable.eo.h" #include "canvas/evas_selectable_interface.eo.h" #include "canvas/evas_zoomable_interface.eo.h" -// Interface classes links -#define EVAS_SMART_CLICKABLE_INTERFACE EVAS_CLICKABLE_INTERFACE_INTERFACE -#define EVAS_SMART_SCROLLABLE_INTERFACE EVAS_SCROLLABLE_INTERFACE_INTERFACE -#define EVAS_SMART_DRAGGABLE_INTERFACE EVAS_DRAGGABLE_INTERFACE_INTERFACE -#define EVAS_SMART_SELECTABLE_INTERFACE EVAS_SELECTABLE_INTERFACE_INTERFACE -#define EVAS_SMART_ZOOMABLE_INTERFACE EVAS_ZOOMABLE_INTERFACE_INTERFACE - #include "canvas/evas_canvas.eo.h" /** diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c index 6697224287..095bde248d 100644 --- a/src/lib/evas/canvas/common_interfaces.c +++ b/src/lib/evas/canvas/common_interfaces.c @@ -3,6 +3,6 @@ #include "canvas/efl_ui_draggable.eo.c" #include "canvas/efl_ui_clickable.eo.c" -#include "canvas/evas_scrollable_interface.eo.c" +#include "canvas/efl_ui_scrollable.eo.c" #include "canvas/evas_selectable_interface.eo.c" #include "canvas/evas_zoomable_interface.eo.c" diff --git a/src/lib/evas/canvas/evas_scrollable_interface.eo b/src/lib/evas/canvas/efl_ui_scrollable.eo similarity index 70% rename from src/lib/evas/canvas/evas_scrollable_interface.eo rename to src/lib/evas/canvas/efl_ui_scrollable.eo index 5fecd9feb6..c356492efb 100644 --- a/src/lib/evas/canvas/evas_scrollable_interface.eo +++ b/src/lib/evas/canvas/efl_ui_scrollable.eo @@ -1,5 +1,6 @@ -interface Evas.Scrollable_Interface () +interface Efl.Ui.Scrollable () { + event_prefix: efl_ui; events { scroll; scroll,anim,start;