summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 17:51:20 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 18:06:15 +0900
commit31c4fd1f7c8e9731e9c36903a79db754d94060ee (patch)
treee15457c1cfb18ed73e3b2a2b151170ecd421a223
parentd67171940f803c7da0ad88048739e1fd85153d05 (diff)
Evas: Rename Scrollable_Interface to Efl.Ui.Scrollable
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/lib/elementary/elm_diskselector.c8
-rw-r--r--src/lib/elementary/elm_diskselector.eo2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_gengrid.c10
-rw-r--r--src/lib/elementary/elm_genlist.c10
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo2
-rw-r--r--src/lib/elementary/elm_map.c10
-rw-r--r--src/lib/elementary/elm_panel.c2
-rw-r--r--src/lib/elementary/elm_photocam.c10
-rw-r--r--src/lib/elementary/elm_photocam.eo2
-rw-r--r--src/lib/elementary/elm_scroller.c10
-rw-r--r--src/lib/elementary/elm_scroller.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.c10
-rw-r--r--src/lib/evas/Evas_Eo.h9
-rw-r--r--src/lib/evas/canvas/common_interfaces.c2
-rw-r--r--src/lib/evas/canvas/efl_ui_scrollable.eo (renamed from src/lib/evas/canvas/evas_scrollable_interface.eo)3
18 files changed, 46 insertions, 52 deletions
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 = \
12 lib/evas/canvas/efl_canvas_image_internal.eo \ 12 lib/evas/canvas/efl_canvas_image_internal.eo \
13 lib/evas/canvas/efl_ui_draggable.eo \ 13 lib/evas/canvas/efl_ui_draggable.eo \
14 lib/evas/canvas/efl_ui_clickable.eo \ 14 lib/evas/canvas/efl_ui_clickable.eo \
15 lib/evas/canvas/evas_scrollable_interface.eo \ 15 lib/evas/canvas/efl_ui_scrollable.eo \
16 lib/evas/canvas/evas_selectable_interface.eo \ 16 lib/evas/canvas/evas_selectable_interface.eo \
17 lib/evas/canvas/evas_zoomable_interface.eo \ 17 lib/evas/canvas/evas_zoomable_interface.eo \
18 lib/evas/canvas/evas_canvas3d_camera.eo\ 18 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,
1099 if (!it) return; 1099 if (!it) return;
1100 _item_select(it); 1100 _item_select(it);
1101 eo_event_callback_call 1101 eo_event_callback_call
1102 (data, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)); 1102 (data, EFL_UI_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it));
1103} 1103}
1104 1104
1105static void 1105static void
@@ -1107,7 +1107,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
1107 void *data EINA_UNUSED) 1107 void *data EINA_UNUSED)
1108{ 1108{
1109 eo_event_callback_call 1109 eo_event_callback_call
1110 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj)); 1110 (obj, EFL_UI_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
1111} 1111}
1112 1112
1113static void 1113static void
@@ -1115,7 +1115,7 @@ _scroll_drag_start_cb(Evas_Object *obj,
1115 void *data EINA_UNUSED) 1115 void *data EINA_UNUSED)
1116{ 1116{
1117 eo_event_callback_call 1117 eo_event_callback_call
1118 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj)); 1118 (obj, EFL_UI_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
1119} 1119}
1120 1120
1121static void 1121static void
@@ -1123,7 +1123,7 @@ _scroll_drag_stop_cb(Evas_Object *obj,
1123 void *data EINA_UNUSED) 1123 void *data EINA_UNUSED)
1124{ 1124{
1125 eo_event_callback_call 1125 eo_event_callback_call
1126 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj)); 1126 (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));
1127} 1127}
1128 1128
1129static void 1129static 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 @@
1class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, 1class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Efl.Ui.Clickable, Evas.Scrollable_Interface, 3 Efl.Ui.Clickable, Efl.Ui.Scrollable,
4 Evas.Selectable_Interface) 4 Evas.Selectable_Interface)
5{ 5{
6 legacy_prefix: elm_diskselector; 6 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)
4897 ELM_ENTRY_DATA_GET(obj, sd); 4897 ELM_ENTRY_DATA_GET(obj, sd);
4898 /* here we need to emit the signal that the elm_scroller would have done */ 4898 /* here we need to emit the signal that the elm_scroller would have done */
4899 eo_event_callback_call 4899 eo_event_callback_call
4900 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); 4900 (obj, EFL_UI_EVENT_SCROLL, NULL);
4901 4901
4902 if (sd->have_selection) 4902 if (sd->have_selection)
4903 _update_selection_handler(obj); 4903 _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
116 116
117class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 117class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
118 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 118 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
119 Evas.Selectable_Interface, Evas.Scrollable_Interface) 119 Evas.Selectable_Interface, Efl.Ui.Scrollable)
120{ 120{
121 legacy_prefix: elm_entry; 121 legacy_prefix: elm_entry;
122 eo_prefix: elm_obj_entry; 122 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
3872_scroll_animate_start_cb(Evas_Object *obj, 3872_scroll_animate_start_cb(Evas_Object *obj,
3873 void *data EINA_UNUSED) 3873 void *data EINA_UNUSED)
3874{ 3874{
3875 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); 3875 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
3876} 3876}
3877 3877
3878static void 3878static void
3879_scroll_animate_stop_cb(Evas_Object *obj, 3879_scroll_animate_stop_cb(Evas_Object *obj,
3880 void *data EINA_UNUSED) 3880 void *data EINA_UNUSED)
3881{ 3881{
3882 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); 3882 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
3883} 3883}
3884 3884
3885static void 3885static void
3886_scroll_drag_start_cb(Evas_Object *obj, 3886_scroll_drag_start_cb(Evas_Object *obj,
3887 void *data EINA_UNUSED) 3887 void *data EINA_UNUSED)
3888{ 3888{
3889 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); 3889 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
3890} 3890}
3891 3891
3892static void 3892static void
3893_scroll_drag_stop_cb(Evas_Object *obj, 3893_scroll_drag_stop_cb(Evas_Object *obj,
3894 void *data EINA_UNUSED) 3894 void *data EINA_UNUSED)
3895{ 3895{
3896 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); 3896 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
3897} 3897}
3898 3898
3899static void 3899static void
@@ -3935,7 +3935,7 @@ static void
3935_scroll_cb(Evas_Object *obj, 3935_scroll_cb(Evas_Object *obj,
3936 void *data EINA_UNUSED) 3936 void *data EINA_UNUSED)
3937{ 3937{
3938 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); 3938 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
3939} 3939}
3940 3940
3941static int 3941static 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
5289_scroll_animate_start_cb(Evas_Object *obj, 5289_scroll_animate_start_cb(Evas_Object *obj,
5290 void *data EINA_UNUSED) 5290 void *data EINA_UNUSED)
5291{ 5291{
5292 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); 5292 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
5293} 5293}
5294 5294
5295static void 5295static void
5296_scroll_animate_stop_cb(Evas_Object *obj, 5296_scroll_animate_stop_cb(Evas_Object *obj,
5297 void *data EINA_UNUSED) 5297 void *data EINA_UNUSED)
5298{ 5298{
5299 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); 5299 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
5300} 5300}
5301 5301
5302static void 5302static void
5303_scroll_drag_start_cb(Evas_Object *obj, 5303_scroll_drag_start_cb(Evas_Object *obj,
5304 void *data EINA_UNUSED) 5304 void *data EINA_UNUSED)
5305{ 5305{
5306 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); 5306 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
5307} 5307}
5308 5308
5309static void 5309static void
5310_scroll_cb(Evas_Object *obj, 5310_scroll_cb(Evas_Object *obj,
5311 void *data EINA_UNUSED) 5311 void *data EINA_UNUSED)
5312{ 5312{
5313 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); 5313 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
5314} 5314}
5315 5315
5316static void 5316static void
5317_scroll_drag_stop_cb(Evas_Object *obj, 5317_scroll_drag_stop_cb(Evas_Object *obj,
5318 void *data EINA_UNUSED) 5318 void *data EINA_UNUSED)
5319{ 5319{
5320 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); 5320 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
5321} 5321}
5322 5322
5323static void 5323static 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
42} 42}
43 43
44 44
45mixin Elm.Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object.Smart) 45mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Evas.Object.Smart)
46{ 46{
47 eo_prefix: elm_interface_scrollable; 47 eo_prefix: elm_interface_scrollable;
48 data: Elm_Scrollable_Smart_Interface_Data; 48 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)
1284 _smooth_update(sd); 1284 _smooth_update(sd);
1285 sd->scr_timer = NULL; 1285 sd->scr_timer = NULL;
1286 eo_event_callback_call 1286 eo_event_callback_call
1287 (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); 1287 (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
1288 1288
1289 return ECORE_CALLBACK_CANCEL; 1289 return ECORE_CALLBACK_CANCEL;
1290} 1290}
@@ -1298,11 +1298,11 @@ _scroll_cb(Evas_Object *obj,
1298 if (sd->scr_timer) ecore_timer_del(sd->scr_timer); 1298 if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
1299 else 1299 else
1300 eo_event_callback_call 1300 eo_event_callback_call
1301 (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); 1301 (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
1302 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); 1302 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
1303 sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj); 1303 sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
1304 eo_event_callback_call 1304 eo_event_callback_call
1305 (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); 1305 (sd->obj, EFL_UI_EVENT_SCROLL, NULL);
1306} 1306}
1307 1307
1308static void 1308static void
@@ -1312,7 +1312,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
1312 ELM_MAP_DATA_GET(obj, sd); 1312 ELM_MAP_DATA_GET(obj, sd);
1313 1313
1314 eo_event_callback_call 1314 eo_event_callback_call
1315 (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); 1315 (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
1316} 1316}
1317 1317
1318static void 1318static void
@@ -1322,7 +1322,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
1322 ELM_MAP_DATA_GET(obj, sd); 1322 ELM_MAP_DATA_GET(obj, sd);
1323 1323
1324 eo_event_callback_call 1324 eo_event_callback_call
1325 (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); 1325 (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
1326} 1326}
1327 1327
1328static Eina_Bool 1328static 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)
1316 break; 1316 break;
1317 } 1317 }
1318 eo_event_callback_call 1318 eo_event_callback_call
1319 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, (void *) &event); 1319 (obj, EFL_UI_EVENT_SCROLL, (void *) &event);
1320} 1320}
1321 1321
1322EOLIAN static Eina_Bool 1322EOLIAN 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,
892 void *data EINA_UNUSED) 892 void *data EINA_UNUSED)
893{ 893{
894 eo_event_callback_call 894 eo_event_callback_call
895 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); 895 (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
896} 896}
897 897
898static void 898static void
@@ -900,7 +900,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
900 void *data EINA_UNUSED) 900 void *data EINA_UNUSED)
901{ 901{
902 eo_event_callback_call 902 eo_event_callback_call
903 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); 903 (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
904} 904}
905 905
906static void 906static void
@@ -908,7 +908,7 @@ _scroll_drag_start_cb(Evas_Object *obj,
908 void *data EINA_UNUSED) 908 void *data EINA_UNUSED)
909{ 909{
910 eo_event_callback_call 910 eo_event_callback_call
911 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); 911 (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
912} 912}
913 913
914static void 914static void
@@ -916,7 +916,7 @@ _scroll_drag_stop_cb(Evas_Object *obj,
916 void *data EINA_UNUSED) 916 void *data EINA_UNUSED)
917{ 917{
918 eo_event_callback_call 918 eo_event_callback_call
919 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); 919 (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
920} 920}
921 921
922static void 922static void
@@ -935,7 +935,7 @@ _scroll_cb(Evas_Object *obj,
935 sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj); 935 sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj);
936 936
937 eo_event_callback_call 937 eo_event_callback_call
938 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); 938 (obj, EFL_UI_EVENT_SCROLL, NULL);
939} 939}
940 940
941static Eina_Bool 941static 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
12 12
13class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, 13class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
14 Elm.Interface.Atspi_Widget_Action, Efl.File, 14 Elm.Interface.Atspi_Widget_Action, Efl.File,
15 Efl.Ui.Clickable, Evas.Scrollable_Interface, 15 Efl.Ui.Clickable, Efl.Ui.Scrollable,
16 Evas.Zoomable_Interface) 16 Evas.Zoomable_Interface)
17{ 17{
18 legacy_prefix: elm_photocam; 18 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,
597 void *data EINA_UNUSED) 597 void *data EINA_UNUSED)
598{ 598{
599 eo_event_callback_call 599 eo_event_callback_call
600 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); 600 (obj, EFL_UI_EVENT_SCROLL, NULL);
601} 601}
602 602
603static void 603static void
@@ -633,7 +633,7 @@ _scroll_anim_start_cb(Evas_Object *obj,
633 void *data EINA_UNUSED) 633 void *data EINA_UNUSED)
634{ 634{
635 eo_event_callback_call 635 eo_event_callback_call
636 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); 636 (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
637} 637}
638 638
639static void 639static void
@@ -641,7 +641,7 @@ _scroll_anim_stop_cb(Evas_Object *obj,
641 void *data EINA_UNUSED) 641 void *data EINA_UNUSED)
642{ 642{
643 eo_event_callback_call 643 eo_event_callback_call
644 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); 644 (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
645} 645}
646 646
647static void 647static void
@@ -649,7 +649,7 @@ _scroll_drag_start_cb(Evas_Object *obj,
649 void *data EINA_UNUSED) 649 void *data EINA_UNUSED)
650{ 650{
651 eo_event_callback_call 651 eo_event_callback_call
652 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); 652 (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
653} 653}
654 654
655static void 655static void
@@ -657,7 +657,7 @@ _scroll_drag_stop_cb(Evas_Object *obj,
657 void *data EINA_UNUSED) 657 void *data EINA_UNUSED)
658{ 658{
659 eo_event_callback_call 659 eo_event_callback_call
660 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); 660 (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
661} 661}
662 662
663static void 663static 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 @@
1class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, 1class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Evas.Scrollable_Interface) 3 Efl.Ui.Scrollable)
4{ 4{
5 legacy_prefix: elm_scroller; 5 legacy_prefix: elm_scroller;
6 eo_prefix: elm_obj_scroller; 6 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
2305_scroll_cb(Evas_Object *obj, 2305_scroll_cb(Evas_Object *obj,
2306 void *data EINA_UNUSED) 2306 void *data EINA_UNUSED)
2307{ 2307{
2308 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL); 2308 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
2309} 2309}
2310 2310
2311static void 2311static void
2312_scroll_anim_start_cb(Evas_Object *obj, 2312_scroll_anim_start_cb(Evas_Object *obj,
2313 void *data EINA_UNUSED) 2313 void *data EINA_UNUSED)
2314{ 2314{
2315 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL); 2315 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
2316} 2316}
2317 2317
2318static void 2318static void
2319_scroll_anim_stop_cb(Evas_Object *obj, 2319_scroll_anim_stop_cb(Evas_Object *obj,
2320 void *data EINA_UNUSED) 2320 void *data EINA_UNUSED)
2321{ 2321{
2322 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL); 2322 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
2323} 2323}
2324 2324
2325static void 2325static void
@@ -2329,14 +2329,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
2329 ELM_TOOLBAR_DATA_GET(obj, sd); 2329 ELM_TOOLBAR_DATA_GET(obj, sd);
2330 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); 2330 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
2331 2331
2332 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL); 2332 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
2333} 2333}
2334 2334
2335static void 2335static void
2336_scroll_drag_stop_cb(Evas_Object *obj, 2336_scroll_drag_stop_cb(Evas_Object *obj,
2337 void *data EINA_UNUSED) 2337 void *data EINA_UNUSED)
2338{ 2338{
2339 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL); 2339 eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
2340} 2340}
2341 2341
2342static void 2342static 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 @@
4 4
5#include "canvas/efl_ui_draggable.eo.h" 5#include "canvas/efl_ui_draggable.eo.h"
6#include "canvas/efl_ui_clickable.eo.h" 6#include "canvas/efl_ui_clickable.eo.h"
7#include "canvas/evas_scrollable_interface.eo.h" 7#include "canvas/efl_ui_scrollable.eo.h"
8#include "canvas/evas_selectable_interface.eo.h" 8#include "canvas/evas_selectable_interface.eo.h"
9#include "canvas/evas_zoomable_interface.eo.h" 9#include "canvas/evas_zoomable_interface.eo.h"
10 10
11// Interface classes links
12#define EVAS_SMART_CLICKABLE_INTERFACE EVAS_CLICKABLE_INTERFACE_INTERFACE
13#define EVAS_SMART_SCROLLABLE_INTERFACE EVAS_SCROLLABLE_INTERFACE_INTERFACE
14#define EVAS_SMART_DRAGGABLE_INTERFACE EVAS_DRAGGABLE_INTERFACE_INTERFACE
15#define EVAS_SMART_SELECTABLE_INTERFACE EVAS_SELECTABLE_INTERFACE_INTERFACE
16#define EVAS_SMART_ZOOMABLE_INTERFACE EVAS_ZOOMABLE_INTERFACE_INTERFACE
17
18#include "canvas/evas_canvas.eo.h" 11#include "canvas/evas_canvas.eo.h"
19 12
20/** 13/**
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 @@
3 3
4#include "canvas/efl_ui_draggable.eo.c" 4#include "canvas/efl_ui_draggable.eo.c"
5#include "canvas/efl_ui_clickable.eo.c" 5#include "canvas/efl_ui_clickable.eo.c"
6#include "canvas/evas_scrollable_interface.eo.c" 6#include "canvas/efl_ui_scrollable.eo.c"
7#include "canvas/evas_selectable_interface.eo.c" 7#include "canvas/evas_selectable_interface.eo.c"
8#include "canvas/evas_zoomable_interface.eo.c" 8#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
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 @@
1interface Evas.Scrollable_Interface () 1interface Efl.Ui.Scrollable ()
2{ 2{
3 event_prefix: efl_ui;
3 events { 4 events {
4 scroll; 5 scroll;
5 scroll,anim,start; 6 scroll,anim,start;