Evas: Rename Scrollable_Interface to Efl.Ui.Scrollable

This commit is contained in:
Jean-Philippe Andre 2016-06-10 17:51:20 +09:00
parent d67171940f
commit 31c4fd1f7c
18 changed files with 46 additions and 52 deletions

View File

@ -12,7 +12,7 @@ evas_eolian_pub_files = \
lib/evas/canvas/efl_canvas_image_internal.eo \ lib/evas/canvas/efl_canvas_image_internal.eo \
lib/evas/canvas/efl_ui_draggable.eo \ lib/evas/canvas/efl_ui_draggable.eo \
lib/evas/canvas/efl_ui_clickable.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_selectable_interface.eo \
lib/evas/canvas/evas_zoomable_interface.eo \ lib/evas/canvas/evas_zoomable_interface.eo \
lib/evas/canvas/evas_canvas3d_camera.eo\ lib/evas/canvas/evas_canvas3d_camera.eo\

View File

@ -1099,7 +1099,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
if (!it) return; if (!it) return;
_item_select(it); _item_select(it);
eo_event_callback_call 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 static void
@ -1107,7 +1107,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call 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 static void
@ -1115,7 +1115,7 @@ _scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call 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 static void
@ -1123,7 +1123,7 @@ _scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call 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 static void

View File

@ -1,6 +1,6 @@
class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi_Widget_Action,
Efl.Ui.Clickable, Evas.Scrollable_Interface, Efl.Ui.Clickable, Efl.Ui.Scrollable,
Evas.Selectable_Interface) Evas.Selectable_Interface)
{ {
legacy_prefix: elm_diskselector; legacy_prefix: elm_diskselector;

View File

@ -4897,7 +4897,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
ELM_ENTRY_DATA_GET(obj, sd); ELM_ENTRY_DATA_GET(obj, sd);
/* here we need to emit the signal that the elm_scroller would have done */ /* here we need to emit the signal that the elm_scroller would have done */
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); (obj, EFL_UI_EVENT_SCROLL, NULL);
if (sd->have_selection) if (sd->have_selection)
_update_selection_handler(obj); _update_selection_handler(obj);

View File

@ -116,7 +116,7 @@ enum Elm.Cnp_Mode
class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 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; legacy_prefix: elm_entry;
eo_prefix: elm_obj_entry; eo_prefix: elm_obj_entry;

View File

@ -3872,28 +3872,28 @@ static void
_scroll_animate_start_cb(Evas_Object *obj, _scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_animate_stop_cb(Evas_Object *obj, _scroll_animate_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_drag_start_cb(Evas_Object *obj, _scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_drag_stop_cb(Evas_Object *obj, _scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
@ -3935,7 +3935,7 @@ static void
_scroll_cb(Evas_Object *obj, _scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static int

View File

@ -5289,35 +5289,35 @@ static void
_scroll_animate_start_cb(Evas_Object *obj, _scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_animate_stop_cb(Evas_Object *obj, _scroll_animate_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_drag_start_cb(Evas_Object *obj, _scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_cb(Evas_Object *obj, _scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_drag_stop_cb(Evas_Object *obj, _scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void

View File

@ -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; eo_prefix: elm_interface_scrollable;
data: Elm_Scrollable_Smart_Interface_Data; data: Elm_Scrollable_Smart_Interface_Data;

View File

@ -1284,7 +1284,7 @@ _scr_timeout_cb(void *data)
_smooth_update(sd); _smooth_update(sd);
sd->scr_timer = NULL; sd->scr_timer = NULL;
eo_event_callback_call 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; return ECORE_CALLBACK_CANCEL;
} }
@ -1298,11 +1298,11 @@ _scroll_cb(Evas_Object *obj,
if (sd->scr_timer) ecore_timer_del(sd->scr_timer); if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
else else
eo_event_callback_call 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); ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj); sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
eo_event_callback_call eo_event_callback_call
(sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); (sd->obj, EFL_UI_EVENT_SCROLL, NULL);
} }
static void static void
@ -1312,7 +1312,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
ELM_MAP_DATA_GET(obj, sd); ELM_MAP_DATA_GET(obj, sd);
eo_event_callback_call 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 static void
@ -1322,7 +1322,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
ELM_MAP_DATA_GET(obj, sd); ELM_MAP_DATA_GET(obj, sd);
eo_event_callback_call 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 static Eina_Bool

View File

@ -1316,7 +1316,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
break; break;
} }
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, (void *) &event); (obj, EFL_UI_EVENT_SCROLL, (void *) &event);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool

View File

@ -892,7 +892,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
} }
static void static void
@ -900,7 +900,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
} }
static void static void
@ -908,7 +908,7 @@ _scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
} }
static void static void
@ -916,7 +916,7 @@ _scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
} }
static void static void
@ -935,7 +935,7 @@ _scroll_cb(Evas_Object *obj,
sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj); sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj);
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); (obj, EFL_UI_EVENT_SCROLL, NULL);
} }
static Eina_Bool static Eina_Bool

View File

@ -12,7 +12,7 @@ enum Elm.Photocam.Zoom_Mode
class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action, Efl.File, Elm.Interface.Atspi_Widget_Action, Efl.File,
Efl.Ui.Clickable, Evas.Scrollable_Interface, Efl.Ui.Clickable, Efl.Ui.Scrollable,
Evas.Zoomable_Interface) Evas.Zoomable_Interface)
{ {
legacy_prefix: elm_photocam; legacy_prefix: elm_photocam;

View File

@ -597,7 +597,7 @@ _scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); (obj, EFL_UI_EVENT_SCROLL, NULL);
} }
static void static void
@ -633,7 +633,7 @@ _scroll_anim_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
} }
static void static void
@ -641,7 +641,7 @@ _scroll_anim_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
} }
static void static void
@ -649,7 +649,7 @@ _scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
} }
static void static void
@ -657,7 +657,7 @@ _scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) void *data EINA_UNUSED)
{ {
eo_event_callback_call eo_event_callback_call
(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
} }
static void static void

View File

@ -1,6 +1,6 @@
class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi_Widget_Action,
Evas.Scrollable_Interface) Efl.Ui.Scrollable)
{ {
legacy_prefix: elm_scroller; legacy_prefix: elm_scroller;
eo_prefix: elm_obj_scroller; eo_prefix: elm_obj_scroller;

View File

@ -2305,21 +2305,21 @@ static void
_scroll_cb(Evas_Object *obj, _scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_anim_start_cb(Evas_Object *obj, _scroll_anim_start_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
_scroll_anim_stop_cb(Evas_Object *obj, _scroll_anim_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void
@ -2329,14 +2329,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
ELM_TOOLBAR_DATA_GET(obj, sd); ELM_TOOLBAR_DATA_GET(obj, sd);
ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); 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 static void
_scroll_drag_stop_cb(Evas_Object *obj, _scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED) 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 static void

View File

@ -4,17 +4,10 @@
#include "canvas/efl_ui_draggable.eo.h" #include "canvas/efl_ui_draggable.eo.h"
#include "canvas/efl_ui_clickable.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_selectable_interface.eo.h"
#include "canvas/evas_zoomable_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" #include "canvas/evas_canvas.eo.h"
/** /**

View File

@ -3,6 +3,6 @@
#include "canvas/efl_ui_draggable.eo.c" #include "canvas/efl_ui_draggable.eo.c"
#include "canvas/efl_ui_clickable.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_selectable_interface.eo.c"
#include "canvas/evas_zoomable_interface.eo.c" #include "canvas/evas_zoomable_interface.eo.c"

View File

@ -1,5 +1,6 @@
interface Evas.Scrollable_Interface () interface Efl.Ui.Scrollable ()
{ {
event_prefix: efl_ui;
events { events {
scroll; scroll;
scroll,anim,start; scroll,anim,start;