aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 17:26:08 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 19:32:43 +0900
commit52f9220b3fceb6f20b22fba30a9a69ae5e448f5a (patch)
tree68b6d762d87f9f8eaa9ff8832aa028998a2d6651
parentEvas: Fix warnings in Efl.Ui.Text (diff)
downloadefl-52f9220b3fceb6f20b22fba30a9a69ae5e448f5a.tar.gz
Evas: Rename smart object into Efl.Canvas.Group
-rw-r--r--src/Makefile_Evas.am4
-rw-r--r--src/lib/edje/edje_calc.c12
-rw-r--r--src/lib/edje/edje_edit.c4
-rw-r--r--src/lib/edje/edje_edit.eo2
-rw-r--r--src/lib/edje/edje_object.eo18
-rw-r--r--src/lib/edje/edje_smart.c30
-rw-r--r--src/lib/elementary/efl_ui_box.c10
-rw-r--r--src/lib/elementary/efl_ui_box.eo6
-rw-r--r--src/lib/elementary/efl_ui_flip.c8
-rw-r--r--src/lib/elementary/efl_ui_flip.eo4
-rw-r--r--src/lib/elementary/efl_ui_grid.c14
-rw-r--r--src/lib/elementary/efl_ui_grid.eo6
-rw-r--r--src/lib/elementary/efl_ui_image.c42
-rw-r--r--src/lib/elementary/efl_ui_image.eo20
-rw-r--r--src/lib/elementary/efl_ui_nstate.c8
-rw-r--r--src/lib/elementary/efl_ui_nstate.eo4
-rw-r--r--src/lib/elementary/efl_ui_text.c28
-rw-r--r--src/lib/elementary/efl_ui_text.eo14
-rw-r--r--src/lib/elementary/efl_ui_win.c24
-rw-r--r--src/lib/elementary/efl_ui_win.eo12
-rw-r--r--src/lib/elementary/elc_combobox.c20
-rw-r--r--src/lib/elementary/elc_ctxpopup.c8
-rw-r--r--src/lib/elementary/elc_fileselector.c8
-rw-r--r--src/lib/elementary/elc_fileselector_button.c8
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c8
-rw-r--r--src/lib/elementary/elc_hoversel.c16
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c8
-rw-r--r--src/lib/elementary/elc_naviframe.c10
-rw-r--r--src/lib/elementary/elc_player.c8
-rw-r--r--src/lib/elementary/elc_popup.c8
-rw-r--r--src/lib/elementary/elm_access.c4
-rw-r--r--src/lib/elementary/elm_access.eo2
-rw-r--r--src/lib/elementary/elm_actionslider.c4
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_bg.c4
-rw-r--r--src/lib/elementary/elm_bg.eo2
-rw-r--r--src/lib/elementary/elm_box.c10
-rw-r--r--src/lib/elementary/elm_box.eo6
-rw-r--r--src/lib/elementary/elm_bubble.c4
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_button.c4
-rw-r--r--src/lib/elementary/elm_button.eo2
-rw-r--r--src/lib/elementary/elm_calendar.c10
-rw-r--r--src/lib/elementary/elm_calendar.eo6
-rw-r--r--src/lib/elementary/elm_check.c4
-rw-r--r--src/lib/elementary/elm_check.eo2
-rw-r--r--src/lib/elementary/elm_clock.c8
-rw-r--r--src/lib/elementary/elm_clock.eo4
-rw-r--r--src/lib/elementary/elm_code_widget.c4
-rw-r--r--src/lib/elementary/elm_code_widget.eo2
-rw-r--r--src/lib/elementary/elm_colorselector.c8
-rw-r--r--src/lib/elementary/elm_colorselector.eo4
-rw-r--r--src/lib/elementary/elm_combobox.eo10
-rw-r--r--src/lib/elementary/elm_conform.c8
-rw-r--r--src/lib/elementary/elm_conformant.eo4
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo4
-rw-r--r--src/lib/elementary/elm_datetime.c8
-rw-r--r--src/lib/elementary/elm_datetime.eo4
-rw-r--r--src/lib/elementary/elm_dayselector.c8
-rw-r--r--src/lib/elementary/elm_dayselector.eo4
-rw-r--r--src/lib/elementary/elm_diskselector.c20
-rw-r--r--src/lib/elementary/elm_diskselector.eo10
-rw-r--r--src/lib/elementary/elm_entry.c28
-rw-r--r--src/lib/elementary/elm_entry.eo14
-rw-r--r--src/lib/elementary/elm_fileselector.eo4
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo4
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo4
-rw-r--r--src/lib/elementary/elm_flipselector.c8
-rw-r--r--src/lib/elementary/elm_flipselector.eo4
-rw-r--r--src/lib/elementary/elm_frame.c6
-rw-r--r--src/lib/elementary/elm_frame.eo4
-rw-r--r--src/lib/elementary/elm_gengrid.c26
-rw-r--r--src/lib/elementary/elm_gengrid.eo10
-rw-r--r--src/lib/elementary/elm_gengrid_pan.eo6
-rw-r--r--src/lib/elementary/elm_genlist.c30
-rw-r--r--src/lib/elementary/elm_genlist.eo10
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo8
-rw-r--r--src/lib/elementary/elm_gesture_layer.c8
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo4
-rw-r--r--src/lib/elementary/elm_glview.c12
-rw-r--r--src/lib/elementary/elm_glview.eo6
-rw-r--r--src/lib/elementary/elm_grid.c8
-rw-r--r--src/lib/elementary/elm_grid.eo4
-rw-r--r--src/lib/elementary/elm_hover.c24
-rw-r--r--src/lib/elementary/elm_hover.eo12
-rw-r--r--src/lib/elementary/elm_hoversel.eo8
-rw-r--r--src/lib/elementary/elm_icon.c8
-rw-r--r--src/lib/elementary/elm_icon.eo4
-rw-r--r--src/lib/elementary/elm_index.c8
-rw-r--r--src/lib/elementary/elm_index.eo4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c28
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo6
-rw-r--r--src/lib/elementary/elm_inwin.c4
-rw-r--r--src/lib/elementary/elm_inwin.eo2
-rw-r--r--src/lib/elementary/elm_label.c4
-rw-r--r--src/lib/elementary/elm_label.eo2
-rw-r--r--src/lib/elementary/elm_layout.c10
-rw-r--r--src/lib/elementary/elm_layout.eo6
-rw-r--r--src/lib/elementary/elm_list.c20
-rw-r--r--src/lib/elementary/elm_list.eo10
-rw-r--r--src/lib/elementary/elm_map.c26
-rw-r--r--src/lib/elementary/elm_map.eo10
-rw-r--r--src/lib/elementary/elm_map_pan.eo6
-rw-r--r--src/lib/elementary/elm_mapbuf.c24
-rw-r--r--src/lib/elementary/elm_mapbuf.eo12
-rw-r--r--src/lib/elementary/elm_menu.c10
-rw-r--r--src/lib/elementary/elm_menu.eo6
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo4
-rw-r--r--src/lib/elementary/elm_naviframe.eo6
-rw-r--r--src/lib/elementary/elm_notify.c26
-rw-r--r--src/lib/elementary/elm_notify.eo12
-rw-r--r--src/lib/elementary/elm_pan.eo14
-rw-r--r--src/lib/elementary/elm_panel.c20
-rw-r--r--src/lib/elementary/elm_panel.eo10
-rw-r--r--src/lib/elementary/elm_panes.c4
-rw-r--r--src/lib/elementary/elm_panes.eo2
-rw-r--r--src/lib/elementary/elm_photo.c8
-rw-r--r--src/lib/elementary/elm_photo.eo4
-rw-r--r--src/lib/elementary/elm_photocam.c26
-rw-r--r--src/lib/elementary/elm_photocam.eo10
-rw-r--r--src/lib/elementary/elm_photocam_pan.eo6
-rw-r--r--src/lib/elementary/elm_player.eo4
-rw-r--r--src/lib/elementary/elm_plug.c4
-rw-r--r--src/lib/elementary/elm_plug.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo4
-rw-r--r--src/lib/elementary/elm_prefs.c8
-rw-r--r--src/lib/elementary/elm_prefs.eo4
-rw-r--r--src/lib/elementary/elm_progressbar.c8
-rw-r--r--src/lib/elementary/elm_progressbar.eo4
-rw-r--r--src/lib/elementary/elm_radio.c8
-rw-r--r--src/lib/elementary/elm_radio.eo4
-rw-r--r--src/lib/elementary/elm_route.c8
-rw-r--r--src/lib/elementary/elm_route.eo4
-rw-r--r--src/lib/elementary/elm_scroller.c16
-rw-r--r--src/lib/elementary/elm_scroller.eo8
-rw-r--r--src/lib/elementary/elm_segment_control.c8
-rw-r--r--src/lib/elementary/elm_segment_control.eo4
-rw-r--r--src/lib/elementary/elm_separator.c4
-rw-r--r--src/lib/elementary/elm_separator.eo2
-rw-r--r--src/lib/elementary/elm_slider.c10
-rw-r--r--src/lib/elementary/elm_slider.eo6
-rw-r--r--src/lib/elementary/elm_slideshow.c8
-rw-r--r--src/lib/elementary/elm_slideshow.eo4
-rw-r--r--src/lib/elementary/elm_spinner.c8
-rw-r--r--src/lib/elementary/elm_spinner.eo4
-rw-r--r--src/lib/elementary/elm_table.c10
-rw-r--r--src/lib/elementary/elm_table.eo6
-rw-r--r--src/lib/elementary/elm_thumb.c16
-rw-r--r--src/lib/elementary/elm_thumb.eo8
-rw-r--r--src/lib/elementary/elm_toolbar.c22
-rw-r--r--src/lib/elementary/elm_toolbar.eo12
-rw-r--r--src/lib/elementary/elm_video.c8
-rw-r--r--src/lib/elementary/elm_video.eo4
-rw-r--r--src/lib/elementary/elm_widget.c30
-rw-r--r--src/lib/elementary/elm_widget.eo30
-rw-r--r--src/lib/emotion/emotion_object.eo20
-rw-r--r--src/lib/emotion/emotion_smart.c18
-rw-r--r--src/lib/evas/Evas_Eo.h4
-rw-r--r--src/lib/evas/Evas_Legacy.h112
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo190
-rw-r--r--src/lib/evas/canvas/efl_canvas_group_clipped.eo17
-rw-r--r--src/lib/evas/canvas/efl_canvas_object_internal_smart_clipped.eo17
-rw-r--r--src/lib/evas/canvas/evas_box.eo10
-rw-r--r--src/lib/evas/canvas/evas_clip.c6
-rw-r--r--src/lib/evas/canvas/evas_grid.eo2
-rw-r--r--src/lib/evas/canvas/evas_name.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c12
-rw-r--r--src/lib/evas/canvas/evas_object_main.c10
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c110
-rw-r--r--src/lib/evas/canvas/evas_object_smart.eo204
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c48
-rw-r--r--src/lib/evas/canvas/evas_object_table.c14
-rw-r--r--src/lib/evas/canvas/evas_render.c2
-rw-r--r--src/lib/evas/canvas/evas_table.eo10
-rw-r--r--src/lib/evas/include/evas_private.h2
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c4
-rw-r--r--src/modules/elementary/web/none/elm_web_none.eo2
177 files changed, 1180 insertions, 1090 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 4f3ddd2957..00a3a46738 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -7,7 +7,7 @@ evas_eolian_pub_files = \
lib/evas/canvas/efl_canvas_rectangle.eo \
lib/evas/canvas/efl_canvas_text.eo \
lib/evas/canvas/efl_canvas_text_cursor.eo \
- lib/evas/canvas/evas_object_smart.eo \
+ lib/evas/canvas/efl_canvas_group.eo \
lib/evas/canvas/evas_common_interface.eo \
lib/evas/canvas/evas_canvas.eo \
lib/evas/canvas/efl_canvas_image_internal.eo \
@@ -42,7 +42,7 @@ evas_eolian_pub_files = \
lib/evas/canvas/efl_canvas_surface_x11.eo \
lib/evas/canvas/efl_canvas_surface_wayland.eo \
lib/evas/canvas/efl_canvas_filter_internal.eo \
- lib/evas/canvas/efl_canvas_object_internal_smart_clipped.eo \
+ lib/evas/canvas/efl_canvas_group_clipped.eo \
lib/evas/canvas/efl_event_input.eo \
lib/evas/canvas/efl_event_key.eo \
lib/evas/canvas/efl_event_pointer.eo \
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index ad1d3c27ea..436825512e 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2939,8 +2939,8 @@ _edje_part_recalc_single(Edje *ed,
{
Evas_Coord lminw = 0, lminh = 0;
- evas_obj_smart_need_recalculate_set(ep->object, 1);
- evas_obj_smart_calculate(ep->object);
+ efl_canvas_group_need_recalculate_set(ep->object, 1);
+ efl_canvas_group_calculate(ep->object);
efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh);
if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h)
{
@@ -2957,8 +2957,8 @@ _edje_part_recalc_single(Edje *ed,
{
Evas_Coord lminw = 0, lminh = 0;
- evas_obj_smart_need_recalculate_set(ep->object, 1);
- evas_obj_smart_calculate(ep->object);
+ efl_canvas_group_need_recalculate_set(ep->object, 1);
+ efl_canvas_group_calculate(ep->object);
efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh);
if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h)
{
@@ -3124,8 +3124,8 @@ _edje_table_recalc_apply(Edje *ed EINA_UNUSED,
evas_obj_table_padding_set(ep->object, chosen_desc->table.padding.x, chosen_desc->table.padding.y);
if (evas_object_smart_need_recalculate_get(ep->object))
{
- evas_obj_smart_need_recalculate_set(ep->object, 0);
- evas_obj_smart_calculate(ep->object);
+ efl_canvas_group_need_recalculate_set(ep->object, 0);
+ efl_canvas_group_calculate(ep->object);
}
}
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 7141853fd6..ded6c81e1b 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -148,11 +148,11 @@ _edje_edit_data_clean(Edje_Edit *eed)
}
EOLIAN static void
-_edje_edit_evas_object_smart_smart_del(Eo *obj, Edje_Edit *eed)
+_edje_edit_efl_canvas_group_group_del(Eo *obj, Edje_Edit *eed)
{
_edje_edit_data_clean(eed);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static void
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index e11c9219b1..aa0e8e6cb3 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -10,7 +10,7 @@ class Edje.Edit (Edje.Object)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_del;
Efl.File.file.set;
}
}
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 012bf33903..0449e4f9c1 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1,6 +1,6 @@
import edje_types;
-class Edje.Object (Efl.Canvas.Object.Internal.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
+class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
{
legacy_prefix: edje_object;
eo_prefix: edje_obj;
@@ -1991,14 +1991,14 @@ class Edje.Object (Efl.Canvas.Object.Internal.Smart.Clipped, Efl.File, Efl.Conta
Eo.Base.destructor;
Eo.Base.dbg_info_get;
Evas.Object.paragraph_direction.set;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_no_render.set;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_no_render.set;
+ Efl.Canvas.Group.group_calculate;
Efl.File.file.set;
Efl.File.file.get;
Efl.File.mmap.set;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index c9bb86373b..72b9dd078e 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -31,7 +31,7 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
Evas *e;
void *tmp;
- ed->base = eo_data_ref(obj, EFL_CANVAS_OBJECT_INTERNAL_SMART_CLIPPED_CLASS);
+ ed->base = eo_data_ref(obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
ed->duration_scale = 1.0;
obj = eo_constructor(eo_super(obj, MY_CLASS));
@@ -109,13 +109,13 @@ _edje_size_class_free(void *data)
/* Private Routines */
EOLIAN static void
-_edje_object_evas_object_smart_smart_add(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_add(Eo *obj, Edje *ed)
{
Evas *tev = evas_object_evas_get(obj);
evas_event_freeze(tev);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
ed->is_rtl = EINA_FALSE;
ed->have_objects = EINA_TRUE;
@@ -147,7 +147,7 @@ _edje_object_evas_object_smart_smart_add(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_del(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_del(Eo *obj, Edje *ed)
{
_edje_block_violate(ed);
ed->delete_me = 1;
@@ -170,7 +170,7 @@ _edje_object_evas_object_smart_smart_del(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
+_edje_object_efl_canvas_group_group_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
{
unsigned int i;
@@ -260,7 +260,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h)
+_edje_object_efl_canvas_group_group_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h)
{
if ((w == ed->w) && (h == ed->h)) return;
if (ed->collection)
@@ -291,12 +291,12 @@ _edje_object_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_show(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_show(Eo *obj, Edje *ed)
{
Eina_List *l;
Edje *edg;
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
if (evas_object_visible_get(obj)) return;
if (_edje_lua_script_only(ed))
{
@@ -319,12 +319,12 @@ _edje_object_evas_object_smart_smart_show(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_hide(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_hide(Eo *obj, Edje *ed)
{
Eina_List *l;
Edje *edg;
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
if (!evas_object_visible_get(obj)) return;
if (_edje_lua_script_only(ed))
{
@@ -337,20 +337,20 @@ _edje_object_evas_object_smart_smart_hide(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_no_render_set(Eo *obj, Edje *ed, Eina_Bool hide)
+_edje_object_efl_canvas_group_group_no_render_set(Eo *obj, Edje *ed, Eina_Bool hide)
{
Eina_List *l;
Edje *edg;
- evas_obj_smart_no_render_set(eo_super(obj, MY_CLASS), hide);
+ efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide);
if (evas_obj_no_render_get(obj) == hide) return;
EINA_LIST_FOREACH(ed->groups, l, edg)
- if (edg != ed) evas_obj_smart_no_render_set(edg->obj, hide);
+ if (edg != ed) efl_canvas_group_no_render_set(edg->obj, hide);
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed)
+_edje_object_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Edje *ed)
{
_edje_recalc_do(ed);
}
@@ -474,7 +474,7 @@ _edje_object_evas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Di
/* Make it dirty to recalculate edje.
It needs to move text objects according to new paragraph direction */
ed->dirty = EINA_TRUE;
- evas_obj_smart_need_recalculate_set(obj, 1);
+ efl_canvas_group_need_recalculate_set(obj, 1);
}
#include "edje_object.eo.c"
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index fb4da38691..0291dd7c3f 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -189,7 +189,7 @@ _efl_ui_box_efl_pack_layout_layout_engine_get(Eo *obj EINA_UNUSED, Efl_Ui_Box_Da
}
EOLIAN static void
-_efl_ui_box_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd)
+_efl_ui_box_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Box_Data *pd)
{
if (pd->recalc) return;
@@ -201,7 +201,7 @@ _efl_ui_box_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd)
}
EOLIAN static void
-_efl_ui_box_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED)
+_efl_ui_box_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED)
{
Evas *e = evas_object_evas_get(obj);
@@ -212,7 +212,7 @@ _efl_ui_box_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSE
evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
eo_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
@@ -226,7 +226,7 @@ _efl_ui_box_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSE
}
EOLIAN static void
-_efl_ui_box_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Box_Data *sd)
+_efl_ui_box_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Box_Data *sd)
{
Eina_List *l;
Evas_Object *child;
@@ -250,7 +250,7 @@ _efl_ui_box_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Box_Data *sd)
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index de805f0904..79658d77ee 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -3,9 +3,9 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout,
{
implements {
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_calculate;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_calculate;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 849ca3e77d..b5cc123e5c 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -1809,9 +1809,9 @@ _efl_ui_flip_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *_pd EINA_UNUSE
}
EOLIAN static void
-_efl_ui_flip_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Flip_Data *priv)
+_efl_ui_flip_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Flip_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -1852,12 +1852,12 @@ _efl_ui_flip_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Flip_Data *priv)
}
EOLIAN static void
-_efl_ui_flip_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Flip_Data *sd)
+_efl_ui_flip_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Flip_Data *sd)
{
ecore_animator_del(sd->animator);
_state_slices_clear(sd);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index 0df3b27089..9792b90270 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -225,8 +225,8 @@ class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.focus_direction;
Elm.Widget.sub_object_add;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 90737cf0a4..7073964ab9 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -165,7 +165,7 @@ _table_size_hints_changed(void *data, Evas *e EINA_UNUSED,
static void _custom_table_calc(Eo *obj, Custom_Table_Data *pd);
static const Eo_Op_Description custom_table_op_desc[] = {
- EO_OP_CLASS_FUNC_OVERRIDE(evas_obj_smart_calculate, _custom_table_calc),
+ EO_OP_CLASS_FUNC_OVERRIDE(efl_canvas_group_calculate, _custom_table_calc),
};
static const Eo_Class_Description custom_table_class_desc = {
@@ -221,11 +221,11 @@ _efl_ui_grid_efl_pack_layout_layout_do(Eo *klass EINA_UNUSED,
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_calculate(eo_super(wd->resize_obj, CUSTOM_TABLE_CLASS));
+ efl_canvas_group_calculate(eo_super(wd->resize_obj, CUSTOM_TABLE_CLASS));
}
EOLIAN void
-_efl_ui_grid_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
+_efl_ui_grid_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -233,7 +233,7 @@ _efl_ui_grid_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EIN
}
EOLIAN static void
-_efl_ui_grid_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd)
+_efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd)
{
Custom_Table_Data *custom;
Evas_Object *table;
@@ -253,7 +253,7 @@ _efl_ui_grid_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd)
evas_object_event_callback_add
(table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _table_size_hints_changed, obj);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_highlight_ignore_set(obj, EINA_FALSE);
@@ -262,7 +262,7 @@ _efl_ui_grid_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd)
}
EOLIAN static void
-_efl_ui_grid_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
+_efl_ui_grid_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
{
Eina_List *l;
Evas_Object *child;
@@ -285,7 +285,7 @@ _efl_ui_grid_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUS
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index b3e148d6b4..63d40c5b26 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -3,9 +3,9 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout,
{
implements {
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_calculate;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_calculate;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 80028a7892..904158073a 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -573,9 +573,9 @@ _efl_ui_image_drag_n_drop_cb(void *elm_obj,
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Image_Data *priv)
+_efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -612,7 +612,7 @@ _efl_ui_image_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Image_Data *priv)
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Image_Data *sd)
+_efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
{
ecore_timer_del(sd->anim_timer);
evas_object_del(sd->img);
@@ -628,7 +628,7 @@ _efl_ui_image_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Image_Data *sd)
{
ERR("Async open thread timed out during cancellation.");
// skipping all other data free to avoid crashes (this leaks)
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
return;
}
sd->async.th = NULL;
@@ -639,13 +639,13 @@ _efl_ui_image_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Image_Data *sd)
eina_stringshare_del(sd->async.file);
eina_stringshare_del(sd->async.key);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y)
+_efl_ui_image_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
if ((sd->img_x == x) && (sd->img_y == y)) return;
sd->img_x = x;
@@ -656,9 +656,9 @@ _efl_ui_image_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h)
+_efl_ui_image_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
if ((sd->img_w == w) && (sd->img_h == h)) return;
@@ -670,12 +670,12 @@ _efl_ui_image_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Eva
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Image_Data *sd)
+_efl_ui_image_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Image_Data *sd)
{
sd->show = EINA_TRUE;
if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return;
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
evas_object_show(sd->img);
@@ -683,9 +683,9 @@ _efl_ui_image_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Image_Data *sd)
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd)
+_efl_ui_image_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Image_Data *sd)
{
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
sd->show = EINA_FALSE;
evas_object_hide(sd->img);
@@ -694,18 +694,18 @@ _efl_ui_image_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd)
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member)
+_efl_ui_image_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a)
+_efl_ui_image_efl_canvas_group_group_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a)
{
- evas_obj_smart_color_set(eo_super(obj, MY_CLASS), r, g, b, a);
+ efl_canvas_group_color_set(eo_super(obj, MY_CLASS), r, g, b, a);
evas_object_color_set(sd->hit_rect, 0, 0, 0, 0);
evas_object_color_set(sd->img, r, g, b, a);
@@ -713,18 +713,18 @@ _efl_ui_image_evas_object_smart_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd,
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip)
+_efl_ui_image_efl_canvas_group_group_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip)
{
- evas_obj_smart_clip_set(eo_super(obj, MY_CLASS), clip);
+ efl_canvas_group_clip_set(eo_super(obj, MY_CLASS), clip);
evas_object_clip_set(sd->img, clip);
if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
}
EOLIAN static void
-_efl_ui_image_evas_object_smart_smart_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd)
+_efl_ui_image_efl_canvas_group_group_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd)
{
- evas_obj_smart_clip_unset(eo_super(obj, MY_CLASS));
+ efl_canvas_group_clip_unset(eo_super(obj, MY_CLASS));
evas_object_clip_unset(sd->img);
if (sd->prev_img) evas_object_clip_unset(sd->prev_img);
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index fd1d3b4451..22762f8cc8 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -153,16 +153,16 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
Edje.Object.size_max.get;
Edje.Object.size_min_calc;
Edje.Object.calc_force;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_clip.set;
- Evas.Object.Smart.smart_clip_unset;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_color.set;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_clip.set;
+ Efl.Canvas.Group.group_clip_unset;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_color.set;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_resize;
Efl.Ui.Draggable.drag_target.set;
Efl.Ui.Draggable.drag_target.get;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 69fb435b04..ccdcc226a3 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -71,11 +71,11 @@ _on_state_changed(void *data,
}
EOLIAN static void
-_efl_ui_nstate_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
+_efl_ui_nstate_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
pd->state = 0;
@@ -90,9 +90,9 @@ _efl_ui_nstate_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
}
EOLIAN static void
-_efl_ui_nstate_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
+_efl_ui_nstate_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
{
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static int
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index e16d703cd0..bf49059414 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -33,8 +33,8 @@ class Efl.Ui.Nstate(Elm.Button)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.event;
}
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 16dc5962ab..3a48e71cdf 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -3717,13 +3717,13 @@ _end_handler_mouse_move_cb(void *data,
}
EOLIAN static void
-_efl_ui_text_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Text_Data *priv)
+_efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
{
Eo *text_obj;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->entry_edje = wd->resize_obj;
@@ -3926,7 +3926,7 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd)
}
EOLIAN static void
-_efl_ui_text_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Text_Data *sd)
+_efl_ui_text_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Text_Data *sd)
{
Elm_Entry_Context_Menu_Item *it;
Elm_Entry_Item_Provider *ip;
@@ -3995,13 +3995,13 @@ _efl_ui_text_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Text_Data *sd)
evas_object_del(sd->end_handler);
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_efl_ui_text_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y)
+_efl_ui_text_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
@@ -4012,9 +4012,9 @@ _efl_ui_text_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Co
}
EOLIAN static void
-_efl_ui_text_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h)
+_efl_ui_text_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
if (sd->have_selection)
@@ -4022,27 +4022,27 @@ _efl_ui_text_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_
}
EOLIAN static void
-_efl_ui_text_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Text_Data *sd)
+_efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd)
{
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
if (sd->have_selection)
_update_selection_handler(obj);
}
EOLIAN static void
-_efl_ui_text_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Text_Data *sd)
+_efl_ui_text_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Text_Data *sd)
{
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
if (sd->have_selection)
_hide_selection_handler(obj);
}
EOLIAN static void
-_efl_ui_text_evas_object_smart_smart_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member)
+_efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 0ca6614f68..9f7cb9a7fb 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -387,13 +387,13 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_hide;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_hide;
Elm.Widget.activate;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 0e6c186090..595f852fe3 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2060,7 +2060,7 @@ _deferred_ecore_evas_free(void *data)
}
EOLIAN static void
-_efl_ui_win_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Win_Data *sd)
+_efl_ui_win_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Win_Data *sd)
{
if (sd->modal_count) return;
const Eina_List *l;
@@ -2068,7 +2068,7 @@ _efl_ui_win_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Win_Data *sd)
Eina_Bool do_eval = EINA_FALSE;
if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE;
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
if ((sd->modal) && (!evas_object_visible_get(obj)))
{
@@ -2103,7 +2103,7 @@ _efl_ui_win_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Win_Data *sd)
}
EOLIAN static void
-_efl_ui_win_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Win_Data *sd)
+_efl_ui_win_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Win_Data *sd)
{
if (sd->modal_count) return;
const Eina_List *l;
@@ -2111,7 +2111,7 @@ _efl_ui_win_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Win_Data *sd)
if (evas_object_visible_get(obj))
_elm_win_state_eval_queue();
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
if ((sd->modal) && (evas_object_visible_get(obj)))
{
@@ -2458,7 +2458,7 @@ _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj)
}
EOLIAN static void
-_efl_ui_win_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Win_Data *sd)
+_efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
{
const Eina_List *l;
Evas_Object *current;
@@ -2571,7 +2571,7 @@ _efl_ui_win_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Win_Data *sd)
ecore_evas_callback_state_change_set(sd->ee, NULL);
ecore_evas_callback_pre_render_set(sd->ee, NULL);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
if (_elm_win_policy_quit_triggered(obj))
{
@@ -2612,7 +2612,7 @@ _elm_win_obj_intercept_show(void *data,
}
EOLIAN static void
-_efl_ui_win_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y)
+_efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y)
{
if (sd->img_obj)
{
@@ -2630,7 +2630,7 @@ _efl_ui_win_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coor
if (!ecore_evas_override_get(sd->ee)) return;
}
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
if (ecore_evas_override_get(sd->ee))
{
@@ -2655,11 +2655,11 @@ _efl_ui_win_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coor
}
EOLIAN static void
-_efl_ui_win_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h)
+_efl_ui_win_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h)
{
if (sd->img_obj)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
if (sd->constrain)
{
int sw, sh;
@@ -3802,9 +3802,9 @@ _elm_win_on_icon_del(void *data,
}
EOLIAN static void
-_efl_ui_win_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
+_efl_ui_win_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_can_focus_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index cd24a5cfb0..946f7975cb 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -763,12 +763,12 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
class.constructor;
Eo.Base.constructor;
Eo.Base.finalize;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 9c793cc32b..284c63f210 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -271,9 +271,9 @@ _on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
}
EOLIAN static void
-_elm_combobox_evas_object_smart_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
+_elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
@@ -285,23 +285,23 @@ _elm_combobox_evas_object_smart_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UN
}
EOLIAN static void
-_elm_combobox_evas_object_smart_smart_del(Eo *obj, Elm_Combobox_Data *sd)
+_elm_combobox_efl_canvas_group_group_del(Eo *obj, Elm_Combobox_Data *sd)
{
sd->hover_parent = NULL;
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_combobox_evas_object_smart_smart_show(Eo *obj, Elm_Combobox_Data *sd)
+_elm_combobox_efl_canvas_group_group_show(Eo *obj, Elm_Combobox_Data *sd)
{
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
if (sd->expanded) evas_object_show(sd->hover);
}
EOLIAN static void
-_elm_combobox_evas_object_smart_smart_hide(Eo *obj, Elm_Combobox_Data *sd)
+_elm_combobox_efl_canvas_group_group_hide(Eo *obj, Elm_Combobox_Data *sd)
{
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
if (sd->hover) evas_object_hide(sd->hover);
}
@@ -630,10 +630,10 @@ _elm_combobox_elm_widget_part_text_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *p
}
EOLIAN static void
-_elm_combobox_evas_object_smart_smart_resize(Eo *obj, Elm_Combobox_Data *pd,
+_elm_combobox_efl_canvas_group_group_resize(Eo *obj, Elm_Combobox_Data *pd,
Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
if (pd->count > 0) _table_resize(obj);
}
#include "elm_combobox.eo.c"
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 07db589ea6..b7f2c6c18e 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1079,11 +1079,11 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd)
}
EOLIAN static void
-_elm_ctxpopup_evas_object_smart_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
+_elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set
@@ -1134,7 +1134,7 @@ _elm_ctxpopup_evas_object_smart_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
}
EOLIAN static void
-_elm_ctxpopup_evas_object_smart_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
+_elm_ctxpopup_efl_canvas_group_group_del(Eo *obj, Elm_Ctxpopup_Data *sd)
{
Elm_Object_Item *it;
@@ -1149,7 +1149,7 @@ _elm_ctxpopup_evas_object_smart_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
EINA_LIST_FREE(sd->items, it)
eo_del(it);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 26bf20f763..4c510b88ea 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -108,7 +108,7 @@ _elm_fileselector_smart_del_do(Elm_Fileselector *fs, Elm_Fileselector_Data *sd)
free(ecore_idler_del(sd->populate_idler));
ecore_idler_del(sd->path_entry_idler);
- evas_obj_smart_del(eo_super(sd->obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(sd->obj, MY_CLASS));
}
static void
@@ -1848,13 +1848,13 @@ _preedit_cb(void *data, const Eo_Event *event)
}
EOLIAN static void
-_elm_fileselector_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
+_elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *priv)
{
Evas_Object *ic, *bt, *en, *pb;
const char *data;
char buf[1024];
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -1982,7 +1982,7 @@ _elm_fileselector_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Data *pr
}
EOLIAN static void
-_elm_fileselector_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Data *sd)
+_elm_fileselector_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Data *sd)
{
Elm_Fileselector_Filter *filter;
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 2a5a74185e..23e53e306d 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -218,11 +218,11 @@ _button_clicked(void *data, const Eo_Event *event EINA_UNUSED)
}
EOLIAN static void
-_elm_fileselector_button_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv)
+_elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Button_Data *priv)
{
const char *path;
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
@@ -246,7 +246,7 @@ _elm_fileselector_button_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_B
}
EOLIAN static void
-_elm_fileselector_button_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
+_elm_fileselector_button_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
{
if (sd->fsd.model)
eo_unref(sd->fsd.model);
@@ -256,7 +256,7 @@ _elm_fileselector_button_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_B
eo_unref(sd->fsd.selection);
evas_object_del(sd->fsw);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index befa79dcad..e15414b6ab 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -317,9 +317,9 @@ _elm_fileselector_entry_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd,
}
EOLIAN static void
-_elm_fileselector_entry_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
+_elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->button = elm_fileselector_button_add(obj);
@@ -377,11 +377,11 @@ _elm_fileselector_entry_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_En
}
EOLIAN static void
-_elm_fileselector_entry_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd)
+_elm_fileselector_entry_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Entry_Data *sd)
{
free(sd->path);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 8dee8039fc..43d91677c6 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -561,9 +561,9 @@ _on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED)
}
EOLIAN static void
-_elm_hoversel_evas_object_smart_smart_add(Eo *obj, Elm_Hoversel_Data *priv)
+_elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
@@ -576,7 +576,7 @@ _elm_hoversel_evas_object_smart_smart_add(Eo *obj, Elm_Hoversel_Data *priv)
}
EOLIAN static void
-_elm_hoversel_evas_object_smart_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
+_elm_hoversel_efl_canvas_group_group_del(Eo *obj, Elm_Hoversel_Data *sd)
{
Elm_Object_Item *eo_item;
@@ -588,20 +588,20 @@ _elm_hoversel_evas_object_smart_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
}
elm_hoversel_hover_parent_set(obj, NULL);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_hoversel_evas_object_smart_smart_show(Eo *obj, Elm_Hoversel_Data *sd)
+_elm_hoversel_efl_canvas_group_group_show(Eo *obj, Elm_Hoversel_Data *sd)
{
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
evas_object_show(sd->hover);
}
EOLIAN static void
-_elm_hoversel_evas_object_smart_smart_hide(Eo *obj, Elm_Hoversel_Data *sd)
+_elm_hoversel_efl_canvas_group_group_hide(Eo *obj, Elm_Hoversel_Data *sd)
{
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
evas_object_hide(sd->hover);
}
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index de16569af1..e19ea287a9 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -1558,11 +1558,11 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
-_elm_multibuttonentry_evas_object_smart_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
+_elm_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set
@@ -1588,7 +1588,7 @@ _elm_multibuttonentry_evas_object_smart_smart_add(Eo *obj, Elm_Multibuttonentry_
}
EOLIAN static void
-_elm_multibuttonentry_evas_object_smart_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd)
+_elm_multibuttonentry_efl_canvas_group_group_del(Eo *obj, Elm_Multibuttonentry_Data *sd)
{
Elm_Object_Item *eo_item;
Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
@@ -1611,7 +1611,7 @@ _elm_multibuttonentry_evas_object_smart_smart_del(Eo *obj, Elm_Multibuttonentry_
EINA_LIST_FREE(sd->filter_list, _item_filter)
_filter_free(_item_filter);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static Eina_Bool _elm_multibuttonentry_smart_focus_next_enable = EINA_FALSE;
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 8f8f32b885..8b6a720851 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1389,11 +1389,11 @@ _elm_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Naviframe_Dat
}
EOLIAN static void
-_elm_naviframe_evas_object_smart_smart_add(Eo *obj, Elm_Naviframe_Data *priv)
+_elm_naviframe_efl_canvas_group_group_add(Eo *obj, Elm_Naviframe_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->dummy_edje = wd->resize_obj;
@@ -1446,7 +1446,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
}
EOLIAN static void
-_elm_naviframe_evas_object_smart_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
+_elm_naviframe_efl_canvas_group_group_del(Eo *obj, Elm_Naviframe_Data *sd)
{
Elm_Naviframe_Item_Data *it;
Elm_Naviframe_Op *nfo;
@@ -1467,12 +1467,12 @@ _elm_naviframe_evas_object_smart_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
evas_object_del(sd->dummy_edje);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
//Show only the top item view
EOLIAN static void
-_elm_naviframe_evas_object_smart_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
+_elm_naviframe_efl_canvas_group_group_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
{
Elm_Object_Item *eo_top;
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 2785cb3309..9c3c9244da 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -646,11 +646,11 @@ end:
EOLIAN static void
-_elm_player_evas_object_smart_smart_add(Eo *obj, Elm_Player_Data *priv)
+_elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
{
char buf[256];
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
@@ -709,9 +709,9 @@ _elm_player_evas_object_smart_smart_add(Eo *obj, Elm_Player_Data *priv)
}
EOLIAN static void
-_elm_player_evas_object_smart_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
+_elm_player_efl_canvas_group_group_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
{
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 494cebd6da..97d8c5b11b 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -234,7 +234,7 @@ _items_remove(Elm_Popup_Data *sd)
}
EOLIAN static void
-_elm_popup_evas_object_smart_smart_del(Eo *obj, Elm_Popup_Data *sd)
+_elm_popup_efl_canvas_group_group_del(Eo *obj, Elm_Popup_Data *sd)
{
unsigned int i;
@@ -277,7 +277,7 @@ _elm_popup_evas_object_smart_smart_del(Eo *obj, Elm_Popup_Data *sd)
ELM_SAFE_FREE(sd->content, evas_object_del);
ELM_SAFE_FREE(sd->title_text, eina_stringshare_del);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static void
@@ -1504,11 +1504,11 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec
}
EOLIAN static void
-_elm_popup_evas_object_smart_smart_add(Eo *obj, Elm_Popup_Data *priv)
+_elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv)
{
char style[1024];
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index dcba5d5949..f7d4cea391 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -35,9 +35,9 @@ static Evas_Object * _elm_access_add(Evas_Object *parent);
static void _access_object_unregister(Evas_Object *obj);
EOLIAN static void
-_elm_access_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
+_elm_access_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
}
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index 416df84396..987e72df7c 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -7,7 +7,7 @@ class Elm.Access (Elm.Widget)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.activate;
Elm.Widget.on_focus;
}
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 5df01e10ac..4301c5e417 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -470,11 +470,11 @@ _elm_actionslider_elm_layout_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_U
}
EOLIAN static void
-_elm_actionslider_evas_object_smart_smart_add(Eo *obj, Elm_Actionslider_Data *priv)
+_elm_actionslider_efl_canvas_group_group_add(Eo *obj, Elm_Actionslider_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->enabled_position = ELM_ACTIONSLIDER_ALL;
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index 4f0e366acb..d3a416d04f 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -71,7 +71,7 @@ class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index a9783a3dfb..5b8e684119 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -89,10 +89,10 @@ _on_resize(void *data,
}
EOLIAN static void
-_elm_bg_evas_object_smart_smart_add(Eo *obj, Elm_Bg_Data *priv)
+_elm_bg_efl_canvas_group_group_add(Eo *obj, Elm_Bg_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
diff --git a/src/lib/elementary/elm_bg.eo b/src/lib/elementary/elm_bg.eo
index d97aa05df6..4020007e59 100644
--- a/src/lib/elementary/elm_bg.eo
+++ b/src/lib/elementary/elm_bg.eo
@@ -96,7 +96,7 @@ class Elm.Bg (Elm.Layout, Efl.File)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Layout.content_aliases.get;
Elm.Layout.sizing_eval;
Efl.File.file.set;
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 0803815966..816fac982a 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -371,7 +371,7 @@ _transition_layout_animation_exec(Evas_Object *obj,
}
EOLIAN static void
-_elm_box_evas_object_smart_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
+_elm_box_efl_canvas_group_group_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -379,7 +379,7 @@ _elm_box_evas_object_smart_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSE
}
EOLIAN static void
-_elm_box_evas_object_smart_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
+_elm_box_efl_canvas_group_group_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_widget_resize_object_set(obj,
@@ -393,7 +393,7 @@ _elm_box_evas_object_smart_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_on_size_hints_changed, obj);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
eo_event_callback_add
@@ -406,7 +406,7 @@ _elm_box_evas_object_smart_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
}
EOLIAN static void
-_elm_box_evas_object_smart_smart_del(Eo *obj, Elm_Box_Data *sd)
+_elm_box_efl_canvas_group_group_del(Eo *obj, Elm_Box_Data *sd)
{
Eina_List *l;
Evas_Object *child;
@@ -430,7 +430,7 @@ _elm_box_evas_object_smart_smart_del(Eo *obj, Elm_Box_Data *sd)
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index dfd075dedc..c99ccade4e 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -285,9 +285,9 @@ class Elm.Box (Elm.Widget)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_calculate;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_calculate;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 4de641e0f6..4c7a848a4a 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -174,11 +174,11 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
-_elm_bubble_evas_object_smart_smart_add(Eo *obj, Elm_Bubble_Data *priv)
+_elm_bubble_efl_canvas_group_group_add(Eo *obj, Elm_Bubble_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 9a5f842743..0af6b717f2 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -38,7 +38,7 @@ class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index 5f1ed84061..252956cb6c 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -281,11 +281,11 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
-_elm_button_evas_object_smart_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
+_elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
edje_object_signal_callback_add
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo
index c15e38e0eb..b034835436 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/elm_button.eo
@@ -75,7 +75,7 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.activate;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index b406591f10..08096dc475 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -1343,7 +1343,7 @@ _elm_calendar_elm_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_
}
EOLIAN static void
-_elm_calendar_evas_object_smart_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED)
+_elm_calendar_efl_canvas_group_group_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED)
{
elm_layout_freeze(obj);
@@ -1370,14 +1370,14 @@ _style_changed(void *data,
}
EOLIAN static void
-_elm_calendar_evas_object_smart_smart_add(Eo *obj, Elm_Calendar_Data *priv)
+_elm_calendar_efl_canvas_group_group_add(Eo *obj, Elm_Calendar_Data *priv)
{
time_t current_time;
int t;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->first_interval = 0.85;
@@ -1437,7 +1437,7 @@ _elm_calendar_evas_object_smart_smart_add(Eo *obj, Elm_Calendar_Data *priv)
}
EOLIAN static void
-_elm_calendar_evas_object_smart_smart_del(Eo *obj, Elm_Calendar_Data *sd)
+_elm_calendar_efl_canvas_group_group_del(Eo *obj, Elm_Calendar_Data *sd)
{
int i;
Elm_Calendar_Mark *mark;
@@ -1457,7 +1457,7 @@ _elm_calendar_evas_object_smart_smart_del(Eo *obj, Elm_Calendar_Data *sd)
for (i = 0; i < ELM_DAY_LAST; i++)
eina_stringshare_del(sd->weekdays[i]);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static Eina_Bool _elm_calendar_smart_focus_next_enable = EINA_FALSE;
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index c569c32c74..41418e2d55 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -383,9 +383,9 @@ class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c
index f8ce9d4aa9..21c0096352 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/elm_check.c
@@ -290,11 +290,11 @@ _on_check_toggle(void *data,
}
EOLIAN static void
-_elm_check_evas_object_smart_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
+_elm_check_efl_canvas_group_group_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj)))
diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo
index 6a9cdebac1..7cb1dfbbcf 100644
--- a/src/lib/elementary/elm_check.eo
+++ b/src/lib/elementary/elm_check.eo
@@ -24,7 +24,7 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.activate;
Elm.Widget.theme_apply;
Elm.Widget.sub_object_del;
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 21c8e39908..b9923085e4 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -650,11 +650,11 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
-_elm_clock_evas_object_smart_smart_add(Eo *obj, Elm_Clock_Data *priv)
+_elm_clock_efl_canvas_group_group_add(Eo *obj, Elm_Clock_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->cur.ampm = -1;
@@ -688,7 +688,7 @@ _elm_clock_evas_object_smart_smart_add(Eo *obj, Elm_Clock_Data *priv)
}
EOLIAN static void
-_elm_clock_evas_object_smart_smart_del(Eo *obj, Elm_Clock_Data *sd)
+_elm_clock_efl_canvas_group_group_del(Eo *obj, Elm_Clock_Data *sd)
{
ecore_timer_del(sd->ticker);
@@ -696,7 +696,7 @@ _elm_clock_evas_object_smart_smart_del(Eo *obj, Elm_Clock_Data *sd)
/* NB: digits are killed for being sub objects, automatically */
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static Eina_Bool _elm_clock_smart_focus_next_enable = EINA_FALSE;
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index 8959183060..1f500daa10 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -163,8 +163,8 @@ class Elm.Clock (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.access;
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 61bb49398f..7deac92bca 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1817,11 +1817,11 @@ _elm_code_widget_cursor_position_get(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *
}
EOLIAN static void
-_elm_code_widget_evas_object_smart_smart_add(Eo *obj, Elm_Code_Widget_Data *pd)
+_elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
{
Evas_Object *background, *gridrows, *scroller;
- evas_obj_smart_add(eo_super(obj, ELM_CODE_WIDGET_CLASS));
+ efl_canvas_group_add(eo_super(obj, ELM_CODE_WIDGET_CLASS));
elm_object_focus_allow_set(obj, EINA_TRUE);
elm_layout_theme_set(obj, "code", "layout", "default");
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index d876dca764..82c6c261e5 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -246,7 +246,7 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text)
class.constructor;
Eo.Base.constructor;
Eo.Base.finalize;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.event;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 124b20e5f7..8de5825f0a 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1861,11 +1861,11 @@ _create_colorcomponents(Evas_Object *obj)
}
EOLIAN static void
-_elm_colorselector_evas_object_smart_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
+_elm_colorselector_efl_canvas_group_group_add(Eo *obj, Elm_Colorselector_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set
@@ -1901,7 +1901,7 @@ _elm_colorselector_evas_object_smart_smart_add(Eo *obj, Elm_Colorselector_Data *
}
EOLIAN static void
-_elm_colorselector_evas_object_smart_smart_del(Eo *obj, Elm_Colorselector_Data *sd)
+_elm_colorselector_efl_canvas_group_group_del(Eo *obj, Elm_Colorselector_Data *sd)
{
int i = 0;
void *tmp[4];
@@ -1922,7 +1922,7 @@ _elm_colorselector_evas_object_smart_smart_del(Eo *obj, Elm_Colorselector_Data *
/* This cb_data are used during the destruction process of base.del */
for (i = 0; i < 4; i++)
tmp[i] = sd->cb_data[i];
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
for (i = 0; i < 4; i++)
free(tmp[i]);
}
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index 6d0415ce8e..20332c7b4d 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -108,8 +108,8 @@ selected.]]
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index c988d77602..75b1caa15e 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -55,11 +55,11 @@ class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.part_text.set;
Elm.Widget.part_text.get;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 49c5c14dd4..3d359b3be6 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -917,9 +917,9 @@ _on_prop_change(void *data,
#endif
EOLIAN static void
-_elm_conformant_evas_object_smart_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
+_elm_conformant_efl_canvas_group_group_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -938,7 +938,7 @@ _elm_conformant_evas_object_smart_smart_add(Eo *obj, Elm_Conformant_Data *_pd EI
}
EOLIAN static void
-_elm_conformant_evas_object_smart_smart_del(Eo *obj, Elm_Conformant_Data *sd)
+_elm_conformant_efl_canvas_group_group_del(Eo *obj, Elm_Conformant_Data *sd)
{
#ifdef HAVE_ELEMENTARY_X
ecore_event_handler_del(sd->prop_hdl);
@@ -955,7 +955,7 @@ _elm_conformant_evas_object_smart_smart_del(Eo *obj, Elm_Conformant_Data *sd)
eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 3746cb5ac5..8d760ea3d7 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -6,8 +6,8 @@ class Elm.Conformant (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.widget_parent.set;
Elm.Widget.theme_apply;
Elm.Layout.content_aliases.get;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 28c4d40d93..12d12e2132 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -203,8 +203,8 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_add;
Elm.Widget.widget_parent.set;
Elm.Widget.focus_direction;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c
index 675408c025..907a052931 100644
--- a/src/lib/elementary/elm_datetime.c
+++ b/src/lib/elementary/elm_datetime.c
@@ -796,12 +796,12 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
}
EOLIAN static void
-_elm_datetime_evas_object_smart_smart_add(Eo *obj, Elm_Datetime_Data *priv)
+_elm_datetime_efl_canvas_group_group_add(Eo *obj, Elm_Datetime_Data *priv)
{
Datetime_Field *field;
int idx;
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
// module - initialise module for datetime
@@ -862,7 +862,7 @@ _elm_datetime_evas_object_smart_smart_add(Eo *obj, Elm_Datetime_Data *priv)
}
EOLIAN static void
-_elm_datetime_evas_object_smart_smart_del(Eo *obj, Elm_Datetime_Data *sd)
+_elm_datetime_efl_canvas_group_group_del(Eo *obj, Elm_Datetime_Data *sd)
{
Datetime_Field *tmp;
unsigned int idx;
@@ -877,7 +877,7 @@ _elm_datetime_evas_object_smart_smart_del(Eo *obj, Elm_Datetime_Data *sd)
if ((dt_mod) && (dt_mod->obj_unhook))
dt_mod->obj_unhook(sd->mod_data); // module - unhook
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_datetime.eo b/src/lib/elementary/elm_datetime.eo
index 6e1fad16ec..d6783799e6 100644
--- a/src/lib/elementary/elm_datetime.eo
+++ b/src/lib/elementary/elm_datetime.eo
@@ -292,8 +292,8 @@ class Elm.Datetime (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index ace82813f7..496be05271 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -415,9 +415,9 @@ _items_create(Evas_Object *obj)
}
EOLIAN static void
-_elm_dayselector_evas_object_smart_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
+_elm_dayselector_efl_canvas_group_group_add(Eo *obj, Elm_Dayselector_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set(obj, "dayselector", "base",
@@ -436,7 +436,7 @@ _elm_dayselector_evas_object_smart_smart_add(Eo *obj, Elm_Dayselector_Data *priv
}
EOLIAN static void
-_elm_dayselector_evas_object_smart_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
+_elm_dayselector_efl_canvas_group_group_del(Eo *obj, Elm_Dayselector_Data *sd)
{
Elm_Dayselector_Item_Data *it;
@@ -448,7 +448,7 @@ _elm_dayselector_evas_object_smart_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
}
/* handles freeing sd */
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index ae3f1789d8..1ede107a26 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -150,8 +150,8 @@ class Elm.Dayselector (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index fcdbf9f93a..959e0188fc 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -1269,7 +1269,7 @@ _round_items_add(Elm_Diskselector_Data *sd)
}
EOLIAN static void
-_elm_diskselector_evas_object_smart_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
+_elm_diskselector_efl_canvas_group_group_add(Eo *obj, Elm_Diskselector_Data *priv)
{
Evas *evas;
Evas_Object *blank, *edje;
@@ -1282,7 +1282,7 @@ _elm_diskselector_evas_object_smart_smart_add(Eo *obj, Elm_Diskselector_Data *pr
edje = edje_object_add(evas);
elm_widget_resize_object_set(obj, edje, EINA_TRUE);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_theme_object_set
(obj, edje, "diskselector", "base", elm_widget_style_get(obj));
@@ -1345,7 +1345,7 @@ _elm_diskselector_evas_object_smart_smart_add(Eo *obj, Elm_Diskselector_Data *pr
}
EOLIAN static void
-_elm_diskselector_evas_object_smart_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
+_elm_diskselector_efl_canvas_group_group_del(Eo *obj, Elm_Diskselector_Data *sd)
{
Elm_Diskselector_Item_Data *it;
Eina_List *l, *l2;
@@ -1417,29 +1417,29 @@ _elm_diskselector_evas_object_smart_smart_del(Eo *obj, Elm_Diskselector_Data *sd
ELM_SAFE_FREE(sd->scroller_move_idle_enterer, ecore_idle_enterer_del);
ELM_SAFE_FREE(sd->string_check_idle_enterer, ecore_idle_enterer_del);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_diskselector_evas_object_smart_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_diskselector_efl_canvas_group_group_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_diskselector_evas_object_smart_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_diskselector_efl_canvas_group_group_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
}
EOLIAN static void
-_elm_diskselector_evas_object_smart_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
+_elm_diskselector_efl_canvas_group_group_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 4a44860901..274f52b4e5 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -197,11 +197,11 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.focus_next_manager_is;
Elm.Widget.access;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 565031706b..ae534b6602 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3594,11 +3594,11 @@ _end_handler_mouse_move_cb(void *data,
}
EOLIAN static void
-_elm_entry_evas_object_smart_smart_add(Eo *obj, Elm_Entry_Data *priv)
+_elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->entry_edje = wd->resize_obj;
@@ -3785,7 +3785,7 @@ _create_selection_handlers(Evas_Object *obj, Elm_Entry_Data *sd)
}
EOLIAN static void
-_elm_entry_evas_object_smart_smart_del(Eo *obj, Elm_Entry_Data *sd)
+_elm_entry_efl_canvas_group_group_del(Eo *obj, Elm_Entry_Data *sd)
{
Elm_Entry_Context_Menu_Item *it;
Elm_Entry_Item_Provider *ip;
@@ -3854,13 +3854,13 @@ _elm_entry_evas_object_smart_smart_del(Eo *obj, Elm_Entry_Data *sd)
evas_object_del(sd->end_handler);
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_entry_evas_object_smart_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_entry_efl_canvas_group_group_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
@@ -3871,9 +3871,9 @@ _elm_entry_evas_object_smart_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord
}
EOLIAN static void
-_elm_entry_evas_object_smart_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_entry_efl_canvas_group_group_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
if (sd->have_selection)
@@ -3881,27 +3881,27 @@ _elm_entry_evas_object_smart_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coor
}
EOLIAN static void
-_elm_entry_evas_object_smart_smart_show(Eo *obj, Elm_Entry_Data *sd)
+_elm_entry_efl_canvas_group_group_show(Eo *obj, Elm_Entry_Data *sd)
{
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
if (sd->have_selection)
_update_selection_handler(obj);
}
EOLIAN static void
-_elm_entry_evas_object_smart_smart_hide(Eo *obj, Elm_Entry_Data *sd)
+_elm_entry_efl_canvas_group_group_hide(Eo *obj, Elm_Entry_Data *sd)
{
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
if (sd->have_selection)
_hide_selection_handler(obj);
}
EOLIAN static void
-_elm_entry_evas_object_smart_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
+_elm_entry_efl_canvas_group_group_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 1260d58e9d..69b86adb59 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -935,13 +935,13 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_hide;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_hide;
Elm.Widget.activate;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 5d00a38938..583cf63846 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -34,8 +34,8 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
class.constructor;
class.destructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.focus_direction;
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index 9ab1acf90e..bf81fd3bea 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -3,8 +3,8 @@ class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector)
event_prefix: elm_fileselector_button;
implements {
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Button.admits_autorepeat.get;
Elm.Interface.Fileselector.selected_models.get;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 16593afe8d..6897111b57 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -6,8 +6,8 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_add;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 4a91947736..0da66390bc 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -604,9 +604,9 @@ _signal_val_change_stop(void *data,
}
EOLIAN static void
-_elm_flipselector_evas_object_smart_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
+_elm_flipselector_efl_canvas_group_group_add(Eo *obj, Elm_Flipselector_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set
@@ -631,7 +631,7 @@ _elm_flipselector_evas_object_smart_smart_add(Eo *obj, Elm_Flipselector_Data *pr
}
EOLIAN static void
-_elm_flipselector_evas_object_smart_smart_del(Eo *obj, Elm_Flipselector_Data *sd)
+_elm_flipselector_efl_canvas_group_group_del(Eo *obj, Elm_Flipselector_Data *sd)
{
sd->deleting = EINA_TRUE;
@@ -642,7 +642,7 @@ _elm_flipselector_evas_object_smart_smart_del(Eo *obj, Elm_Flipselector_Data *sd
ecore_timer_del(sd->spin);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index 82ff09e68e..d538200ecc 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -126,8 +126,8 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c
index 38d4f216cb..87c06341cf 100644
--- a/src/lib/elementary/elm_frame.c
+++ b/src/lib/elementary/elm_frame.c
@@ -145,7 +145,7 @@ _on_frame_clicked(void *data,
/* using deferred sizing evaluation, just like the parent */
EOLIAN static void
-_elm_frame_evas_object_smart_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
+_elm_frame_efl_canvas_group_group_calculate(Eo *obj, Elm_Frame_Data *sd)
{
ELM_LAYOUT_DATA_GET(obj, ld);
@@ -158,11 +158,11 @@ _elm_frame_evas_object_smart_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
}
EOLIAN static void
-_elm_frame_evas_object_smart_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
+_elm_frame_efl_canvas_group_group_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
edje_object_signal_callback_add
diff --git a/src/lib/elementary/elm_frame.eo b/src/lib/elementary/elm_frame.eo
index e4d51d09a6..053f3495ee 100644
--- a/src/lib/elementary/elm_frame.eo
+++ b/src/lib/elementary/elm_frame.eo
@@ -51,8 +51,8 @@ class Elm.Frame (Elm.Layout, Efl.Ui.Clickable)
implements {
Eo.Base.constructor;
class.constructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 8be8782750..edbb52a6df 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -481,14 +481,14 @@ _elm_gengrid_pan_eo_base_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
}
EOLIAN static void
-_elm_gengrid_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
+_elm_gengrid_pan_efl_canvas_group_group_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
{
ecore_job_del(psd->wsd->calc_job);
psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
}
EOLIAN static void
-_elm_gengrid_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
+_elm_gengrid_pan_efl_canvas_group_group_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
{
Evas_Coord ow, oh;
@@ -1854,7 +1854,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
}
EOLIAN static void
-_elm_gengrid_pan_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd)
+_elm_gengrid_pan_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd)
{
Evas_Coord cx = 0, cy = 0;
Elm_Gen_Item *it;
@@ -4218,13 +4218,13 @@ _elm_gengrid_elm_layout_sizing_eval(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *_pd E
}
EOLIAN static void
-_elm_gengrid_evas_object_smart_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
+_elm_gengrid_efl_canvas_group_group_add(Eo *obj, Elm_Gengrid_Data *priv)
{
Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
Elm_Gengrid_Pan_Data *pan_data;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -4284,7 +4284,7 @@ _elm_gengrid_evas_object_smart_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
}
EOLIAN static void
-_elm_gengrid_evas_object_smart_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
+_elm_gengrid_efl_canvas_group_group_del(Eo *obj, Elm_Gengrid_Data *sd)
{
elm_gengrid_clear(obj);
ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
@@ -4293,29 +4293,29 @@ _elm_gengrid_evas_object_smart_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
_item_cache_zero(sd);
ecore_job_del(sd->calc_job);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_gengrid_evas_object_smart_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_gengrid_efl_canvas_group_group_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_gengrid_evas_object_smart_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_gengrid_efl_canvas_group_group_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
}
EOLIAN static void
-_elm_gengrid_evas_object_smart_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
+_elm_gengrid_efl_canvas_group_group_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 02775c856b..d4eafa574d 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -540,11 +540,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo
index 0d34a3ab39..249eb77475 100644
--- a/src/lib/elementary/elm_gengrid_pan.eo
+++ b/src/lib/elementary/elm_gengrid_pan.eo
@@ -6,9 +6,9 @@ class Elm.Gengrid.Pan (Elm.Pan)
implements {
class.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_resize;
Elm.Pan.content_size.get;
Elm.Pan.pos;
Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 4de6210ae4..3d38929366 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -259,15 +259,15 @@ _elm_genlist_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_D
}
EOLIAN static void
-_elm_genlist_pan_evas_object_smart_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
+_elm_genlist_pan_efl_canvas_group_group_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
{
ecore_job_del(psd->resize_job);
- evas_obj_smart_del(eo_super(obj, MY_PAN_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_PAN_CLASS));
}
EOLIAN static void
-_elm_genlist_pan_evas_object_smart_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
+_elm_genlist_pan_efl_canvas_group_group_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED)
{
psd->wsd->pan_changed = EINA_TRUE;
evas_object_smart_changed(obj);
@@ -284,7 +284,7 @@ _elm_genlist_pan_smart_resize_job(void *data)
}
EOLIAN static void
-_elm_genlist_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
+_elm_genlist_pan_efl_canvas_group_group_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
{
Evas_Coord ow, oh;
@@ -2452,7 +2452,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd)
}
EOLIAN static void
-_elm_genlist_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd)
+_elm_genlist_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd)
{
Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0;
@@ -5525,14 +5525,14 @@ _evas_viewport_resize_cb(void *d, Evas *e EINA_UNUSED, void *ei EINA_UNUSED)
}
EOLIAN static void
-_elm_genlist_evas_object_smart_smart_add(Eo *obj, Elm_Genlist_Data *priv)
+_elm_genlist_efl_canvas_group_group_add(Eo *obj, Elm_Genlist_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Elm_Genlist_Pan_Data *pan_data;
Evas_Coord minw, minh;
int i;
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->size_caches = eina_hash_pointer_new(_size_cache_free);
@@ -5610,7 +5610,7 @@ _elm_genlist_evas_object_smart_smart_add(Eo *obj, Elm_Genlist_Data *priv)
}
EOLIAN static void
-_elm_genlist_evas_object_smart_smart_del(Eo *obj, Elm_Genlist_Data *sd)
+_elm_genlist_efl_canvas_group_group_del(Eo *obj, Elm_Genlist_Data *sd)
{
int i;
@@ -5633,21 +5633,21 @@ _elm_genlist_evas_object_smart_smart_del(Eo *obj, Elm_Genlist_Data *sd)
_elm_genlist_tree_effect_stop(sd);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_genlist_evas_object_smart_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_genlist_efl_canvas_group_group_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_genlist_evas_object_smart_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_genlist_efl_canvas_group_group_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
if ((sd->queue) && (!sd->queue_idle_enterer) && (w > 0))
@@ -5655,9 +5655,9 @@ _elm_genlist_evas_object_smart_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_
}
EOLIAN static void
-_elm_genlist_evas_object_smart_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
+_elm_genlist_efl_canvas_group_group_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 95852db18b..1448f6e83b 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -526,11 +526,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.sub_object_add;
diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo
index b1bfc8d9fd..f90a5919fc 100644
--- a/src/lib/elementary/elm_genlist_pan.eo
+++ b/src/lib/elementary/elm_genlist_pan.eo
@@ -6,10 +6,10 @@ class Elm.Genlist.Pan (Elm.Pan)
implements {
class.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Pan.content_size.get;
Elm.Pan.pos;
Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index 5307d19770..a0f9e30a42 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -3734,9 +3734,9 @@ _elm_gesture_layer_elm_widget_disable(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_
}
EOLIAN static void
-_elm_gesture_layer_evas_object_smart_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
+_elm_gesture_layer_efl_canvas_group_group_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->line_min_length =
@@ -3767,7 +3767,7 @@ _elm_gesture_layer_evas_object_smart_smart_add(Eo *obj, Elm_Gesture_Layer_Data *
static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type);
EOLIAN static void
-_elm_gesture_layer_evas_object_smart_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd)
+_elm_gesture_layer_efl_canvas_group_group_del(Eo *obj, Elm_Gesture_Layer_Data *sd)
{
Pointer_Event *data;
int i;
@@ -3810,7 +3810,7 @@ _elm_gesture_layer_evas_object_smart_smart_del(Eo *obj, Elm_Gesture_Layer_Data *
if (!elm_widget_disabled_get(obj))
_callbacks_unregister(obj);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index e4e042649d..988e86b152 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -155,8 +155,8 @@ class Elm.Gesture_Layer (Elm.Widget)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.disable;
}
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 3aaba7b916..a010c15dc2 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -86,9 +86,9 @@ _glview_update_surface(Evas_Object *obj)
}
EOLIAN static void
-_elm_glview_evas_object_smart_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_glview_efl_canvas_group_group_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
sd->resized = EINA_TRUE;
@@ -220,7 +220,7 @@ _set_render_policy_callback(Evas_Object *obj)
}
EOLIAN static void
-_elm_glview_evas_object_smart_smart_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSED)
+_elm_glview_efl_canvas_group_group_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSED)
{
Evas_Object *img;
@@ -231,7 +231,7 @@ _elm_glview_evas_object_smart_smart_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUS
elm_widget_resize_object_set(obj, img, EINA_TRUE);
evas_object_image_size_set(img, 1, 1);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
}
static void
@@ -287,7 +287,7 @@ _elm_glview_constructor(Eo *obj, Elm_Glview_Data *priv)
}
EOLIAN static void
-_elm_glview_evas_object_smart_smart_del(Eo *obj, Elm_Glview_Data *sd)
+_elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -315,7 +315,7 @@ _elm_glview_evas_object_smart_smart_del(Eo *obj, Elm_Glview_Data *sd)
if (sd->config) evas_gl_config_free(sd->config);
if (sd->evasgl) evas_gl_free(sd->evasgl);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static Eina_Bool
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index 09be477fde..c911cfb2ae 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -184,9 +184,9 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View)
implements {
class.constructor;
Eo.Base.finalize;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.on_focus;
Efl.Gfx.View.view_size.get;
Efl.Gfx.View.view_size.set;
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index a787ea3d00..349408a683 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -116,7 +116,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
}
EOLIAN static void
-_elm_grid_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
+_elm_grid_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Object *grid;
@@ -127,7 +127,7 @@ _elm_grid_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
elm_widget_resize_object_set(obj, grid, EINA_TRUE);
evas_object_grid_size_set(wd->resize_obj, 100, 100);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -135,7 +135,7 @@ _elm_grid_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
}
EOLIAN static void
-_elm_grid_evas_object_smart_smart_del(Eo *obj, void *_pd EINA_UNUSED)
+_elm_grid_efl_canvas_group_group_del(Eo *obj, void *_pd EINA_UNUSED)
{
Eina_List *l;
Evas_Object *child;
@@ -154,7 +154,7 @@ _elm_grid_evas_object_smart_smart_del(Eo *obj, void *_pd EINA_UNUSED)
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo
index e820c6cbf2..db3397cfe9 100644
--- a/src/lib/elementary/elm_grid.eo
+++ b/src/lib/elementary/elm_grid.eo
@@ -54,8 +54,8 @@ class Elm.Grid (Elm.Widget)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index c73e3fe0f6..2d554891cf 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -564,9 +564,9 @@ _hov_dismiss_cb(void *data,
}
EOLIAN static void
-_elm_hover_evas_object_smart_smart_add(Eo *obj, Elm_Hover_Data *sd)
+_elm_hover_efl_canvas_group_group_add(Eo *obj, Elm_Hover_Data *sd)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
ELM_HOVER_PARTS_FOREACH
@@ -595,7 +595,7 @@ _elm_hover_evas_object_smart_smart_add(Eo *obj, Elm_Hover_Data *sd)
}
EOLIAN static void
-_elm_hover_evas_object_smart_smart_del(Eo *obj, Elm_Hover_Data *sd)
+_elm_hover_efl_canvas_group_group_del(Eo *obj, Elm_Hover_Data *sd)
{
sd->on_del = EINA_TRUE;
@@ -612,39 +612,39 @@ _elm_hover_evas_object_smart_smart_del(Eo *obj, Elm_Hover_Data *sd)
_elm_hover_parent_detach(obj);
sd->parent = NULL;
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_hover_evas_object_smart_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
+_elm_hover_efl_canvas_group_group_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
elm_layout_sizing_eval(obj);
}
EOLIAN static void
-_elm_hover_evas_object_smart_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
+_elm_hover_efl_canvas_group_group_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
elm_layout_sizing_eval(obj);
}
EOLIAN static void
-_elm_hover_evas_object_smart_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
+_elm_hover_efl_canvas_group_group_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
{
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
_hov_show_do(obj);
}
EOLIAN static void
-_elm_hover_evas_object_smart_smart_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
+_elm_hover_efl_canvas_group_group_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
{
const char *dismissstr;
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
// for backward compatibility
dismissstr = elm_layout_data_get(obj, "dismiss");
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index df440d2ae7..135c342c79 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -60,12 +60,12 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.sub_object_add;
Elm.Widget.widget_parent;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 225cdaad54..9d4b2fceac 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -92,10 +92,10 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
class.constructor;
Eo.Base.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.widget_parent.set;
Elm.Widget.theme_apply;
Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 81d0c562c5..ff9d1d6e42 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -490,16 +490,16 @@ _elm_icon_thumb_resize_cb(void *data,
}
EOLIAN static void
-_elm_icon_evas_object_smart_smart_add(Eo *obj, Elm_Icon_Data *priv)
+_elm_icon_efl_canvas_group_group_add(Eo *obj, Elm_Icon_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->thumb.request = NULL;
}
EOLIAN static void
-_elm_icon_evas_object_smart_smart_del(Eo *obj, Elm_Icon_Data *sd)
+_elm_icon_efl_canvas_group_group_del(Eo *obj, Elm_Icon_Data *sd)
{
eina_stringshare_del(sd->stdicon);
@@ -517,7 +517,7 @@ _elm_icon_evas_object_smart_smart_del(Eo *obj, Elm_Icon_Data *sd)
_edje_signals_free(sd);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
/* WARNING: to be deprecated */
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index f0a1bc6ea6..e44fd68f7c 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -16,8 +16,8 @@ class Elm.Icon (Efl.Ui.Image)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Efl.File.file.set;
}
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 6124929f85..5b2536d4b2 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -1032,14 +1032,14 @@ _sort_cb(const void *d1, const void *d2)
EOLIAN static void
-_elm_index_evas_object_smart_smart_add(Eo *obj, Elm_Index_Data *priv)
+_elm_index_efl_canvas_group_group_add(Eo *obj, Elm_Index_Data *priv)
{
Evas_Object *o;
Evas_Coord minw = 0, minh = 0;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set
@@ -1110,7 +1110,7 @@ _elm_index_evas_object_smart_smart_add(Eo *obj, Elm_Index_Data *priv)
}
EOLIAN static void
-_elm_index_evas_object_smart_smart_del(Eo *obj, Elm_Index_Data *sd)
+_elm_index_efl_canvas_group_group_del(Eo *obj, Elm_Index_Data *sd)
{
Elm_Index_Omit *o;
@@ -1122,7 +1122,7 @@ _elm_index_evas_object_smart_smart_del(Eo *obj, Elm_Index_Data *sd)
ecore_timer_del(sd->delay);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static Eina_Bool _elm_index_smart_focus_next_enable = EINA_FALSE;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index db0b6f2cb9..7f76d03aea 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -220,8 +220,8 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 66f77aefde..7f13988186 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -104,23 +104,23 @@ _elm_pan_update(Elm_Pan_Smart_Data *psd)
}
EOLIAN static void
-_elm_pan_evas_object_smart_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
+_elm_pan_efl_canvas_group_group_add(Eo *obj, Elm_Pan_Smart_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_PAN_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_PAN_CLASS));
priv->self = obj;
}
EOLIAN static void
-_elm_pan_evas_object_smart_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
+_elm_pan_efl_canvas_group_group_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
{
_elm_pan_content_set(obj, NULL);
- evas_obj_smart_del(eo_super(obj, MY_PAN_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_PAN_CLASS));
}
EOLIAN static void
-_elm_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y)
+_elm_pan_efl_canvas_group_group_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y)
{
psd->x = x;
psd->y = y;
@@ -129,7 +129,7 @@ _elm_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *p
}
EOLIAN static void
-_elm_pan_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h)
+_elm_pan_efl_canvas_group_group_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h)
{
psd->w = w;
psd->h = h;
@@ -139,18 +139,18 @@ _elm_pan_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data
}
EOLIAN static void
-_elm_pan_evas_object_smart_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
+_elm_pan_efl_canvas_group_group_show(Eo *obj, Elm_Pan_Smart_Data *psd)
{
- evas_obj_smart_show(eo_super(obj, MY_PAN_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_PAN_CLASS));
if (psd->content)
evas_object_show(psd->content);
}
EOLIAN static void
-_elm_pan_evas_object_smart_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
+_elm_pan_efl_canvas_group_group_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
{
- evas_obj_smart_hide(eo_super(obj, MY_PAN_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_PAN_CLASS));
if (psd->content)
evas_object_hide(psd->content);
@@ -4485,7 +4485,7 @@ _elm_interface_scrollable_loop_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Int
}
EOLIAN static void
-_elm_interface_scrollable_evas_object_smart_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
+_elm_interface_scrollable_efl_canvas_group_group_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
{
memset(sid, 0, sizeof(*sid));
@@ -4518,14 +4518,14 @@ _elm_interface_scrollable_evas_object_smart_smart_add(Eo *obj, Elm_Scrollable_Sm
_elm_scroll_scroll_bar_reset(sid);
- evas_obj_smart_add(eo_super(obj, MY_SCROLLABLE_INTERFACE));
+ efl_canvas_group_add(eo_super(obj, MY_SCROLLABLE_INTERFACE));
}
EOLIAN static void
-_elm_interface_scrollable_evas_object_smart_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
+_elm_interface_scrollable_efl_canvas_group_group_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
{
- evas_obj_smart_del(eo_super(obj, MY_SCROLLABLE_INTERFACE));
+ efl_canvas_group_del(eo_super(obj, MY_SCROLLABLE_INTERFACE));
elm_interface_scrollable_content_set(obj, NULL);
if (!sid->extern_pan) evas_object_del(sid->pan_obj);
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index 706172fc00..b9b3a85a3e 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(Efl.Ui.Scrollable, Evas.Object.Smart)
+mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
{
eo_prefix: elm_interface_scrollable;
data: Elm_Scrollable_Smart_Interface_Data;
@@ -662,8 +662,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Evas.Object.Smart)
}
implements {
class.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
}
events {
changed;
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index f077c5b943..38908d8b3a 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -66,9 +66,9 @@ _elm_inwin_elm_widget_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Elm
}
EOLIAN static void
-_elm_inwin_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
+_elm_inwin_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index acd71092a9..2e089b268a 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -21,7 +21,7 @@ class Elm.Inwin (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.widget_parent.set;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 3e0d120179..12e5707c00 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -365,11 +365,11 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
}
EOLIAN static void
-_elm_label_evas_object_smart_smart_add(Eo *obj, Elm_Label_Data *priv)
+_elm_label_efl_canvas_group_group_add(Eo *obj, Elm_Label_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index 2e9018f889..d04fcb5420 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -123,7 +123,7 @@ class Elm.Label (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 66677baeb9..9d87908f72 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -758,7 +758,7 @@ _on_size_evaluate_signal(void *data,
}
EOLIAN static void
-_elm_layout_evas_object_smart_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
+_elm_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
Evas_Object *edje;
@@ -768,7 +768,7 @@ _elm_layout_evas_object_smart_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA
edje = edje_object_add(evas_object_evas_get(obj));
elm_widget_resize_object_set(obj, edje, EINA_TRUE);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -779,7 +779,7 @@ _elm_layout_evas_object_smart_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA
}
EOLIAN static void
-_elm_layout_evas_object_smart_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
+_elm_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd)
{
Elm_Layout_Sub_Object_Data *sub_d;
Elm_Layout_Sub_Object_Cursor *pc;
@@ -831,13 +831,13 @@ _elm_layout_evas_object_smart_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
sd->destructed_is = EINA_TRUE;
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
/* rewrite or extend this one on your derived class as to suit your
* needs */
EOLIAN static void
-_elm_layout_evas_object_smart_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
+_elm_layout_efl_canvas_group_group_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
{
if (sd->needs_size_calc)
{
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index 2ddbbeb567..e7e52c4908 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -331,9 +331,9 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
Eo.Base.dbg_info_get;
Efl.File.file.set;
Efl.File.file.get;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_calculate;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_calculate;
Elm.Widget.focus_direction;
Elm.Widget.sub_object_add;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index f361f44d09..29ac55cea5 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -2387,13 +2387,13 @@ _elm_list_elm_widget_focus_next(Eo *obj, Elm_List_Data *sd, Elm_Focus_Direction
}
EOLIAN static void
-_elm_list_evas_object_smart_smart_add(Eo *obj, Elm_List_Data *priv)
+_elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv)
{
Evas_Coord minw, minh;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -2453,7 +2453,7 @@ _elm_list_evas_object_smart_smart_add(Eo *obj, Elm_List_Data *priv)
}
EOLIAN static void
-_elm_list_evas_object_smart_smart_del(Eo *obj, Elm_List_Data *sd)
+_elm_list_efl_canvas_group_group_del(Eo *obj, Elm_List_Data *sd)
{
const Eina_List *l;
Elm_Object_Item *eo_it;
@@ -2499,29 +2499,29 @@ _elm_list_evas_object_smart_smart_del(Eo *obj, Elm_List_Data *sd)
sd->selected = eina_list_free(sd->selected);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_list_evas_object_smart_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_list_efl_canvas_group_group_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_list_evas_object_smart_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_list_efl_canvas_group_group_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
}
EOLIAN static void
-_elm_list_evas_object_smart_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
+_elm_list_efl_canvas_group_group_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 22795496a8..6b48304316 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -429,11 +429,11 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 445e787c36..6e75709c4b 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3861,7 +3861,7 @@ _elm_map_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Map_Pan_Data *psd
}
EOLIAN static void
-_elm_map_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED)
+_elm_map_pan_efl_canvas_group_group_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED)
{
_sizing_eval(psd->wsd->obj);
elm_map_zoom_mode_set(psd->wobj, psd->wsd->mode);
@@ -3869,7 +3869,7 @@ _elm_map_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas
}
EOLIAN static void
-_elm_map_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
+_elm_map_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
{
Evas_Coord w, h;
@@ -3883,7 +3883,7 @@ _elm_map_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
}
EOLIAN static void
-_elm_map_pan_evas_object_smart_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
+_elm_map_pan_efl_canvas_group_group_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
{
evas_object_smart_changed(obj);
}
@@ -4032,7 +4032,7 @@ _elm_map_elm_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *sr
}
EOLIAN static void
-_elm_map_evas_object_smart_smart_add(Eo *obj, Elm_Map_Data *priv)
+_elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
{
Evas_Coord minw, minh;
Elm_Map_Pan_Data *pan_data;
@@ -4043,7 +4043,7 @@ _elm_map_evas_object_smart_smart_add(Eo *obj, Elm_Map_Data *priv)
edje = edje_object_add(evas_object_evas_get(obj));
elm_widget_resize_object_set(obj, edje, EINA_TRUE);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_theme_object_set
(obj, edje, "map", "base", elm_widget_style_get(obj));
@@ -4141,7 +4141,7 @@ _elm_map_evas_object_smart_smart_add(Eo *obj, Elm_Map_Data *priv)
}
EOLIAN static void
-_elm_map_evas_object_smart_smart_del(Eo *obj, Elm_Map_Data *sd)
+_elm_map_efl_canvas_group_group_del(Eo *obj, Elm_Map_Data *sd)
{
Elm_Map_Route *r;
Elm_Map_Name *na;
@@ -4197,29 +4197,29 @@ _elm_map_evas_object_smart_smart_del(Eo *obj, Elm_Map_Data *sd)
evas_object_del(sd->pan_obj);
sd->pan_obj = NULL;
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_map_evas_object_smart_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_map_efl_canvas_group_group_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_map_evas_object_smart_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_map_efl_canvas_group_group_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
}
EOLIAN static void
-_elm_map_evas_object_smart_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
+_elm_map_efl_canvas_group_group_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index a099d0b2a3..a8b0b926b2 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -626,11 +626,11 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.event;
diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo
index 3a4eb53186..e31a30eafc 100644
--- a/src/lib/elementary/elm_map_pan.eo
+++ b/src/lib/elementary/elm_map_pan.eo
@@ -6,9 +6,9 @@ class Elm.Map.Pan (Elm.Pan)
implements {
class.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_resize;
Elm.Pan.content_size.get;
Elm.Pan.pos;
Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index bb725c7648..e98c3fef66 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -156,9 +156,9 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd)
}
EOLIAN static void
-_elm_mapbuf_evas_object_smart_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_mapbuf_efl_canvas_group_group_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
_mapbuf_auto_eval(obj, sd);
_mapbuf_auto_smooth(obj, sd);
@@ -166,9 +166,9 @@ _elm_mapbuf_evas_object_smart_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coor
}
EOLIAN static void
-_elm_mapbuf_evas_object_smart_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_mapbuf_efl_canvas_group_group_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
if (sd->content) evas_object_resize(sd->content, w, h);
_mapbuf_auto_eval(obj, sd);
@@ -176,18 +176,18 @@ _elm_mapbuf_evas_object_smart_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Co
}
EOLIAN static void
-_elm_mapbuf_evas_object_smart_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
+_elm_mapbuf_efl_canvas_group_group_show(Eo *obj, Elm_Mapbuf_Data *sd)
{
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
_mapbuf_auto_eval(obj, sd);
_configure(obj);
}
EOLIAN static void
-_elm_mapbuf_evas_object_smart_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd)
+_elm_mapbuf_efl_canvas_group_group_hide(Eo *obj, Elm_Mapbuf_Data *sd)
{
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
_mapbuf_auto_eval(obj, sd);
_configure(obj);
@@ -264,23 +264,23 @@ _elm_mapbuf_efl_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd)
}
EOLIAN static void
-_elm_mapbuf_evas_object_smart_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
+_elm_mapbuf_efl_canvas_group_group_del(Eo *obj, Elm_Mapbuf_Data *priv)
{
ELM_SAFE_FREE(priv->idler, ecore_idler_del);
ELM_SAFE_FREE(priv->map, evas_map_free);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_mapbuf_evas_object_smart_smart_add(Eo *obj, Elm_Mapbuf_Data *priv)
+_elm_mapbuf_efl_canvas_group_group_add(Eo *obj, Elm_Mapbuf_Data *priv)
{
Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj));
int i;
elm_widget_resize_object_set(obj, rect, EINA_TRUE);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
evas_object_static_clip_set(rect, EINA_TRUE);
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index c9592420cb..6b7c2baac7 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -129,12 +129,12 @@ class Elm.Mapbuf (Elm.Widget, Efl.Container, Efl.Part)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.sub_object_del;
Efl.Container.content.get;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index a8072ab5a9..662a54d85e 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -556,7 +556,7 @@ _unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
}
EOLIAN static void
-_elm_menu_evas_object_smart_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
+_elm_menu_efl_canvas_group_group_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
{
evas_object_show(sd->hv);
}
@@ -672,9 +672,9 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
}
EOLIAN static void
-_elm_menu_evas_object_smart_smart_add(Eo *obj, Elm_Menu_Data *priv)
+_elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -701,7 +701,7 @@ _elm_menu_evas_object_smart_smart_add(Eo *obj, Elm_Menu_Data *priv)
}
EOLIAN static void
-_elm_menu_evas_object_smart_smart_del(Eo *obj, Elm_Menu_Data *sd)
+_elm_menu_efl_canvas_group_group_del(Eo *obj, Elm_Menu_Data *sd)
{
Elm_Object_Item *eo_item;
@@ -721,7 +721,7 @@ _elm_menu_evas_object_smart_smart_del(Eo *obj, Elm_Menu_Data *sd)
evas_object_del(sd->hv);
evas_object_del(sd->location);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
void
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 6c055b218c..550f2af204 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -72,9 +72,9 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Elm.Interface.Atspi.Selection)
class.constructor;
Eo.Base.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.widget_parent;
Elm.Widget.theme_apply;
Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index df0560f1d6..5c7e5bf9f3 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -176,8 +176,8 @@ class Elm.Multibuttonentry (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 7a48fb5ad8..95c54c6e04 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -142,9 +142,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index c57a1a4769..810e71e52c 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -226,11 +226,11 @@ _block_area_clicked_cb(void *data,
}
EOLIAN static void
-_elm_notify_evas_object_smart_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_notify_efl_canvas_group_group_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w, Evas_Coord h)
{
Evas_Coord x, y;
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
if (!sd->parent && sd->content)
{
@@ -240,11 +240,11 @@ _elm_notify_evas_object_smart_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Co
}
EOLIAN static void
-_elm_notify_evas_object_smart_smart_move(Eo *obj, Elm_Notify_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_notify_efl_canvas_group_group_move(Eo *obj, Elm_Notify_Data *sd, Evas_Coord x, Evas_Coord y)
{
Evas_Coord w, h;
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
if (!sd->parent && sd->content)
{
@@ -282,11 +282,11 @@ _timer_init(Evas_Object *obj,
}
EOLIAN static void
-_elm_notify_evas_object_smart_smart_show(Eo *obj, Elm_Notify_Data *sd)
+_elm_notify_efl_canvas_group_group_show(Eo *obj, Elm_Notify_Data *sd)
{
sd->had_hidden = EINA_FALSE;
sd->in_timeout = EINA_FALSE;
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
evas_object_show(sd->notify);
if (!sd->allow_events) evas_object_show(sd->block_events);
@@ -295,7 +295,7 @@ _elm_notify_evas_object_smart_smart_show(Eo *obj, Elm_Notify_Data *sd)
}
EOLIAN static void
-_elm_notify_evas_object_smart_smart_hide(Eo *obj, Elm_Notify_Data *sd)
+_elm_notify_efl_canvas_group_group_hide(Eo *obj, Elm_Notify_Data *sd)
{
const char *hide_signal;
@@ -310,7 +310,7 @@ _elm_notify_evas_object_smart_smart_hide(Eo *obj, Elm_Notify_Data *sd)
}
else //for backport supporting: edc without emitting hide finished signal
{
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
evas_object_hide(sd->notify);
if (sd->allow_events) evas_object_hide(sd->block_events);
}
@@ -447,14 +447,14 @@ _hide_finished_cb(void *data,
sd->had_hidden = EINA_TRUE;
evas_object_hide(sd->notify);
if (!sd->allow_events) evas_object_hide(sd->block_events);
- evas_obj_smart_hide(eo_super(data, MY_CLASS));
+ efl_canvas_group_hide(eo_super(data, MY_CLASS));
eo_event_callback_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
}
EOLIAN static void
-_elm_notify_evas_object_smart_smart_add(Eo *obj, Elm_Notify_Data *priv)
+_elm_notify_efl_canvas_group_group_add(Eo *obj, Elm_Notify_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->allow_events = EINA_TRUE;
@@ -470,7 +470,7 @@ _elm_notify_evas_object_smart_smart_add(Eo *obj, Elm_Notify_Data *priv)
}
EOLIAN static void
-_elm_notify_evas_object_smart_smart_del(Eo *obj, Elm_Notify_Data *sd)
+_elm_notify_efl_canvas_group_group_del(Eo *obj, Elm_Notify_Data *sd)
{
edje_object_signal_callback_del_full
(sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj);
@@ -479,7 +479,7 @@ _elm_notify_evas_object_smart_smart_del(Eo *obj, Elm_Notify_Data *sd)
ecore_timer_del(sd->timer);
ELM_SAFE_FREE(sd->notify, evas_object_del);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index 3edcdf134b..89851a75f5 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -79,12 +79,12 @@ class Elm.Notify (Elm.Widget, Efl.Container, Efl.Part)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.focus_direction;
Elm.Widget.widget_parent;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index c9d6474a91..e70c9a99c4 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Pan (Efl.Canvas.Object.Internal.Smart.Clipped)
+class Elm.Pan (Efl.Canvas.Group.Clipped)
{
legacy_prefix: elm_pan;
eo_prefix: elm_obj_pan;
@@ -53,12 +53,12 @@ class Elm.Pan (Efl.Canvas.Object.Internal.Smart.Clipped)
implements {
Eo.Base.constructor;
class.constructor;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
}
events {
changed;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index da6b727852..85572f8853 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1001,11 +1001,11 @@ _elm_panel_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part)
}
EOLIAN static void
-_elm_panel_evas_object_smart_smart_add(Eo *obj, Elm_Panel_Data *priv)
+_elm_panel_efl_canvas_group_group_add(Eo *obj, Elm_Panel_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -1049,7 +1049,7 @@ _elm_panel_evas_object_smart_smart_add(Eo *obj, Elm_Panel_Data *priv)
}
EOLIAN static void
-_elm_panel_evas_object_smart_smart_del(Eo *obj, Elm_Panel_Data *sd)
+_elm_panel_efl_canvas_group_group_del(Eo *obj, Elm_Panel_Data *sd)
{
Evas_Object *child;
Eina_List *l;
@@ -1072,13 +1072,13 @@ _elm_panel_evas_object_smart_smart_del(Eo *obj, Elm_Panel_Data *sd)
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_panel_evas_object_smart_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_panel_efl_canvas_group_group_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
@@ -1101,9 +1101,9 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
}
EOLIAN static void
-_elm_panel_evas_object_smart_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_panel_efl_canvas_group_group_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
if (!sd->scrollable) return;
@@ -1131,9 +1131,9 @@ _elm_panel_evas_object_smart_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coor
}
EOLIAN static void
-_elm_panel_evas_object_smart_smart_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member)
+_elm_panel_efl_canvas_group_group_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect) evas_object_raise(sd->hit_rect);
}
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index 62fe3595f9..75528a585c 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -68,11 +68,11 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_move;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index 401a652c84..f9c406d6f5 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -262,12 +262,12 @@ _on_resize(void *data,
}
EOLIAN static void
-_elm_panes_evas_object_smart_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
+_elm_panes_efl_canvas_group_group_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
ELM_PANES_DATA_GET(obj, sd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index da6266e64d..54db5851bc 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -117,7 +117,7 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 3a72e3a3db..317f405d85 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -243,11 +243,11 @@ _on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED)
}
EOLIAN static void
-_elm_photo_evas_object_smart_smart_add(Eo *obj, Elm_Photo_Data *priv)
+_elm_photo_efl_canvas_group_group_add(Eo *obj, Elm_Photo_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -287,11 +287,11 @@ _elm_photo_evas_object_smart_smart_add(Eo *obj, Elm_Photo_Data *priv)
}
EOLIAN static void
-_elm_photo_evas_object_smart_smart_del(Eo *obj, Elm_Photo_Data *sd)
+_elm_photo_efl_canvas_group_group_del(Eo *obj, Elm_Photo_Data *sd)
{
ecore_timer_del(sd->long_press_timer);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo
index a2f661ddcc..209b93468f 100644
--- a/src/lib/elementary/elm_photo.eo
+++ b/src/lib/elementary/elm_photo.eo
@@ -6,8 +6,8 @@ class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable)
class.constructor;
Eo.Base.constructor;
Efl.File.file.set;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
}
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 4bda0a923e..9cfec5d38f 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -145,14 +145,14 @@ _calc_job_cb(void *data)
}
EOLIAN static void
-_elm_photocam_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
+_elm_photocam_pan_efl_canvas_group_group_move(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
{
ecore_job_del(psd->wsd->calc_job);
psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
}
EOLIAN static void
-_elm_photocam_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
+_elm_photocam_pan_efl_canvas_group_group_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
{
Evas_Coord ow, oh;
@@ -345,7 +345,7 @@ _grid_place(Evas_Object *obj,
}
EOLIAN static void
-_elm_photocam_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd)
+_elm_photocam_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd)
{
Elm_Phocam_Grid *g;
Eina_List *l;
@@ -1376,7 +1376,7 @@ _elm_photocam_image_orient_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd)
}
EOLIAN static void
-_elm_photocam_evas_object_smart_smart_add(Eo *obj, Elm_Photocam_Data *priv)
+_elm_photocam_efl_canvas_group_group_add(Eo *obj, Elm_Photocam_Data *priv)
{
Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
Elm_Photocam_Pan_Data *pan_data;
@@ -1388,7 +1388,7 @@ _elm_photocam_evas_object_smart_smart_add(Eo *obj, Elm_Photocam_Data *priv)
edje = edje_object_add(evas_object_evas_get(obj));
elm_widget_resize_object_set(obj, edje, EINA_TRUE);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_theme_object_set
(obj, edje, "photocam", "base", elm_widget_style_get(obj));
@@ -1452,7 +1452,7 @@ _elm_photocam_evas_object_smart_smart_add(Eo *obj, Elm_Photocam_Data *priv)
}
EOLIAN static void
-_elm_photocam_evas_object_smart_smart_del(Eo *obj, Elm_Photocam_Data *sd)
+_elm_photocam_efl_canvas_group_group_del(Eo *obj, Elm_Photocam_Data *sd)
{
Elm_Phocam_Grid *g;
@@ -1473,30 +1473,30 @@ _elm_photocam_evas_object_smart_smart_del(Eo *obj, Elm_Photocam_Data *sd)
eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_photocam_evas_object_smart_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_photocam_efl_canvas_group_group_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_photocam_evas_object_smart_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_photocam_efl_canvas_group_group_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
}
EOLIAN static void
-_elm_photocam_evas_object_smart_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member)
+_elm_photocam_efl_canvas_group_group_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index e3143fb78c..b456137f29 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -189,11 +189,11 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.event;
diff --git a/src/lib/elementary/elm_photocam_pan.eo b/src/lib/elementary/elm_photocam_pan.eo
index 93d3505b97..36f0b5fdf2 100644
--- a/src/lib/elementary/elm_photocam_pan.eo
+++ b/src/lib/elementary/elm_photocam_pan.eo
@@ -6,9 +6,9 @@ class Elm.Photocam.Pan (Elm.Pan)
implements {
class.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_resize;
Elm.Pan.content_size.get;
Elm.Pan.pos;
Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index d8831991c4..f3d42d68a2 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -6,8 +6,8 @@ class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.event;
Elm.Layout.sizing_eval;
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 5b359bc5cb..3dc73f7014 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -107,13 +107,13 @@ _on_mouse_up(void *data,
}
EOLIAN static void
-_elm_plug_evas_object_smart_smart_add(Eo *obj, void *sd EINA_UNUSED)
+_elm_plug_efl_canvas_group_group_add(Eo *obj, void *sd EINA_UNUSED)
{
Evas_Object *p_obj;
Ecore_Evas *ee;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 830f4ed2cc..9e3a60ff80 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -32,7 +32,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
}
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 68001920f8..9d4aa06d38 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -167,8 +167,8 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index 038bf562d8..dfca0e11c9 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -46,9 +46,9 @@ static Eina_Bool _prefs_item_widget_value_from_self(Elm_Prefs_Item_Node *,
Eina_Bool);
EOLIAN static void
-_elm_prefs_evas_object_smart_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
+_elm_prefs_efl_canvas_group_group_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
}
@@ -447,7 +447,7 @@ _elm_prefs_data_cbs_del(Eo *obj)
}
EOLIAN static void
-_elm_prefs_evas_object_smart_smart_del(Eo *obj, Elm_Prefs_Data *sd)
+_elm_prefs_efl_canvas_group_group_del(Eo *obj, Elm_Prefs_Data *sd)
{
sd->delete_me = EINA_TRUE;
@@ -469,7 +469,7 @@ _elm_prefs_evas_object_smart_smart_del(Eo *obj, Elm_Prefs_Data *sd)
eina_stringshare_del(sd->file);
eina_stringshare_del(sd->page);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 3232406811..16060fc095 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -216,8 +216,8 @@ class Elm.Prefs (Elm.Widget, Efl.File)
Eo.Base.constructor;
Efl.File.file.set;
Efl.File.file.get;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_next;
}
events {
diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c
index 631080efd9..3913d1337e 100644
--- a/src/lib/elementary/elm_progressbar.c
+++ b/src/lib/elementary/elm_progressbar.c
@@ -279,11 +279,11 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
-_elm_progressbar_evas_object_smart_smart_add(Eo *obj, Elm_Progressbar_Data *priv)
+_elm_progressbar_efl_canvas_group_group_add(Eo *obj, Elm_Progressbar_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->orientation = EFL_ORIENT_RIGHT;
@@ -318,7 +318,7 @@ _elm_progressbar_evas_object_smart_smart_add(Eo *obj, Elm_Progressbar_Data *priv
}
EOLIAN static void
-_elm_progressbar_evas_object_smart_smart_del(Eo *obj, Elm_Progressbar_Data *sd)
+_elm_progressbar_efl_canvas_group_group_del(Eo *obj, Elm_Progressbar_Data *sd)
{
Elm_Progress_Status *progress_obj;
@@ -332,7 +332,7 @@ _elm_progressbar_evas_object_smart_smart_del(Eo *obj, Elm_Progressbar_Data *sd)
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo
index f40c0224a2..082a979154 100644
--- a/src/lib/elementary/elm_progressbar.eo
+++ b/src/lib/elementary/elm_progressbar.eo
@@ -57,8 +57,8 @@ class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c
index 5fcf9389f6..28fbc8e4eb 100644
--- a/src/lib/elementary/elm_radio.c
+++ b/src/lib/elementary/elm_radio.c
@@ -220,11 +220,11 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
EOLIAN static void
-_elm_radio_evas_object_smart_smart_add(Eo *obj, Elm_Radio_Data *priv)
+_elm_radio_efl_canvas_group_group_add(Eo *obj, Elm_Radio_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, ELM_CHECK_CLASS));
+ efl_canvas_group_add(eo_super(obj, ELM_CHECK_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
@@ -250,12 +250,12 @@ _elm_radio_evas_object_smart_smart_add(Eo *obj, Elm_Radio_Data *priv)
}
EOLIAN static void
-_elm_radio_evas_object_smart_smart_del(Eo *obj, Elm_Radio_Data *sd)
+_elm_radio_efl_canvas_group_group_del(Eo *obj, Elm_Radio_Data *sd)
{
sd->group->radios = eina_list_remove(sd->group->radios, obj);
if (!sd->group->radios) free(sd->group);
- evas_obj_smart_del(eo_super(obj, ELM_CHECK_CLASS));
+ efl_canvas_group_del(eo_super(obj, ELM_CHECK_CLASS));
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 6a482422e5..1be44f4093 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -78,8 +78,8 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.activate;
Elm.Widget.event;
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index b7e755809e..4e78c00a5e 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -134,10 +134,10 @@ _update_lon_lat_min_max(Evas_Object *obj,
#endif
EOLIAN static void
-_elm_route_evas_object_smart_smart_add(Eo *obj, Elm_Route_Data *priv)
+_elm_route_efl_canvas_group_group_add(Eo *obj, Elm_Route_Data *priv)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -159,11 +159,11 @@ _elm_route_evas_object_smart_smart_add(Eo *obj, Elm_Route_Data *priv)
}
EOLIAN static void
-_elm_route_evas_object_smart_smart_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
+_elm_route_efl_canvas_group_group_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
{
_clear_route(obj);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
/**
diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo
index b3b46b3825..391b800dd7 100644
--- a/src/lib/elementary/elm_route.eo
+++ b/src/lib/elementary/elm_route.eo
@@ -41,8 +41,8 @@ class Elm.Route (Elm.Widget)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
}
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 3b06b4ffed..3f173ae340 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -858,12 +858,12 @@ _elm_scroller_content_viewport_resize_cb(Evas_Object *obj,
}
EOLIAN static void
-_elm_scroller_evas_object_smart_smart_add(Eo *obj, Elm_Scroller_Data *priv)
+_elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw, minh;
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -915,25 +915,25 @@ _elm_scroller_evas_object_smart_smart_add(Eo *obj, Elm_Scroller_Data *priv)
}
EOLIAN static void
-_elm_scroller_evas_object_smart_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_scroller_efl_canvas_group_group_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_scroller_evas_object_smart_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_scroller_efl_canvas_group_group_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
}
EOLIAN static void
-_elm_scroller_evas_object_smart_smart_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member)
+_elm_scroller_efl_canvas_group_group_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 81841c85c1..d4eb65fcf6 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -60,10 +60,10 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.theme_apply;
Elm.Widget.activate;
Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 98c8cc8064..0b31ff4e7d 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -608,10 +608,10 @@ _elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_
}
EOLIAN static void
-_elm_segment_control_evas_object_smart_smart_add(Eo *obj, Elm_Segment_Control_Data *sd)
+_elm_segment_control_efl_canvas_group_group_add(Eo *obj, Elm_Segment_Control_Data *sd)
{
sd->obj = obj;
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set
@@ -627,7 +627,7 @@ _elm_segment_control_evas_object_smart_smart_add(Eo *obj, Elm_Segment_Control_Da
}
EOLIAN static void
-_elm_segment_control_evas_object_smart_smart_del(Eo *obj, Elm_Segment_Control_Data *sd)
+_elm_segment_control_efl_canvas_group_group_del(Eo *obj, Elm_Segment_Control_Data *sd)
{
Elm_Object_Item *eo_it;
@@ -636,7 +636,7 @@ _elm_segment_control_evas_object_smart_smart_del(Eo *obj, Elm_Segment_Control_Da
eo_del(eo_it);
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static Eina_Bool _elm_segment_control_smart_focus_next_enable = EINA_FALSE;
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 324a141b39..55390f65ed 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -135,8 +135,8 @@ class Elm.Segment_Control (Elm.Layout)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index d70ae0ed4a..a79f20ae14 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -45,9 +45,9 @@ _elm_separator_elm_layout_sizing_eval(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
}
EOLIAN static void
-_elm_separator_evas_object_smart_smart_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
+_elm_separator_efl_canvas_group_group_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
{
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index 497f0b6885..507ee61c63 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -5,7 +5,7 @@ class Elm.Separator (Elm.Layout, Efl.Orientation)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 6b8a3b3096..b499e9f77a 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1072,7 +1072,7 @@ _min_max_set(Evas_Object *obj)
}
EOLIAN static void
-_elm_slider_evas_object_smart_smart_calculate(Eo *obj, Elm_Slider_Data *sd)
+_elm_slider_efl_canvas_group_group_calculate(Eo *obj, Elm_Slider_Data *sd)
{
elm_layout_freeze(obj);
@@ -1137,11 +1137,11 @@ _on_show(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
}
EOLIAN static void
-_elm_slider_evas_object_smart_smart_add(Eo *obj, Elm_Slider_Data *priv)
+_elm_slider_efl_canvas_group_group_add(Eo *obj, Elm_Slider_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->orientation = EFL_ORIENT_RIGHT;
@@ -1202,7 +1202,7 @@ _elm_slider_evas_object_smart_smart_add(Eo *obj, Elm_Slider_Data *priv)
}
EOLIAN static void
-_elm_slider_evas_object_smart_smart_del(Eo *obj, Elm_Slider_Data *sd)
+_elm_slider_efl_canvas_group_group_del(Eo *obj, Elm_Slider_Data *sd)
{
eina_stringshare_del(sd->indicator);
eina_stringshare_del(sd->units);
@@ -1211,7 +1211,7 @@ _elm_slider_evas_object_smart_smart_del(Eo *obj, Elm_Slider_Data *sd)
evas_object_del(sd->popup);
evas_object_del(sd->popup2);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index d029c03460..4f7df47f8b 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -171,9 +171,9 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.activate;
Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index 10ffa28f43..729378525f 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -319,11 +319,11 @@ _elm_slideshow_item_eo_base_destructor(Eo *eo_item, Elm_Slideshow_Item_Data *ite
}
EOLIAN static void
-_elm_slideshow_evas_object_smart_smart_add(Eo *obj, Elm_Slideshow_Data *priv)
+_elm_slideshow_efl_canvas_group_group_add(Eo *obj, Elm_Slideshow_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->count_item_pre_before = 2;
@@ -363,7 +363,7 @@ _elm_slideshow_evas_object_smart_smart_add(Eo *obj, Elm_Slideshow_Data *priv)
}
EOLIAN static void
-_elm_slideshow_evas_object_smart_smart_del(Eo *obj, Elm_Slideshow_Data *sd)
+_elm_slideshow_efl_canvas_group_group_del(Eo *obj, Elm_Slideshow_Data *sd)
{
const char *layout;
@@ -374,7 +374,7 @@ _elm_slideshow_evas_object_smart_smart_del(Eo *obj, Elm_Slideshow_Data *sd)
EINA_LIST_FREE(sd->layout.list, layout)
eina_stringshare_del(layout);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index 923b3e2248..2753f7ead6 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -303,8 +303,8 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.event;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index b7bec1821c..80bb591d34 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1154,12 +1154,12 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
-_elm_spinner_evas_object_smart_smart_add(Eo *obj, Elm_Spinner_Data *priv)
+_elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
ELM_SPINNER_DATA_GET(obj, sd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
priv->val_max = 100.0;
@@ -1237,7 +1237,7 @@ _elm_spinner_evas_object_smart_smart_add(Eo *obj, Elm_Spinner_Data *priv)
}
EOLIAN static void
-_elm_spinner_evas_object_smart_smart_del(Eo *obj, Elm_Spinner_Data *sd)
+_elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd)
{
Elm_Spinner_Special_Value *sv;
@@ -1255,7 +1255,7 @@ _elm_spinner_evas_object_smart_smart_del(Eo *obj, Elm_Spinner_Data *sd)
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index 074a720373..f31493b427 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -145,8 +145,8 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index fd4dee2a15..1e8cafe226 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -163,7 +163,7 @@ _elm_table_elm_widget_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, Evas_Object
}
EOLIAN static void
-_elm_table_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
+_elm_table_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
{
Evas_Object *table;
@@ -175,7 +175,7 @@ _elm_table_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
evas_object_event_callback_add
(table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_highlight_ignore_set(obj, EINA_FALSE);
@@ -184,7 +184,7 @@ _elm_table_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
}
EOLIAN static void
-_elm_table_evas_object_smart_smart_del(Eo *obj, void *_pd EINA_UNUSED)
+_elm_table_efl_canvas_group_group_del(Eo *obj, void *_pd EINA_UNUSED)
{
Eina_List *l;
Evas_Object *child;
@@ -207,7 +207,7 @@ _elm_table_evas_object_smart_smart_del(Eo *obj, void *_pd EINA_UNUSED)
}
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
@@ -407,7 +407,7 @@ _elm_table_class_constructor(Eo_Class *klass)
}
EOLIAN void
-_elm_table_evas_object_smart_smart_calculate(Eo *obj, void *pd EINA_UNUSED)
+_elm_table_efl_canvas_group_group_calculate(Eo *obj, void *pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo
index 637c330549..b2064d547d 100644
--- a/src/lib/elementary/elm_table.eo
+++ b/src/lib/elementary/elm_table.eo
@@ -119,9 +119,9 @@ class Elm.Table (Elm.Widget)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_calculate;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_calculate;
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 2d9b3159e9..b9393977e8 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -453,19 +453,19 @@ _thumb_show(Elm_Thumb_Data *sd)
}
EOLIAN static void
-_elm_thumb_evas_object_smart_smart_show(Eo *obj, Elm_Thumb_Data *sd)
+_elm_thumb_efl_canvas_group_group_show(Eo *obj, Elm_Thumb_Data *sd)
{
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
_thumb_show(sd);
}
EOLIAN static void
-_elm_thumb_evas_object_smart_smart_hide(Eo *obj, Elm_Thumb_Data *sd)
+_elm_thumb_efl_canvas_group_group_hide(Eo *obj, Elm_Thumb_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
if (sd->thumb.request)
{
@@ -524,11 +524,11 @@ elm_need_ethumb(void)
}
EOLIAN static void
-_elm_thumb_evas_object_smart_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED)
+_elm_thumb_efl_canvas_group_group_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
@@ -543,7 +543,7 @@ _elm_thumb_evas_object_smart_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED)
}
EOLIAN static void
-_elm_thumb_evas_object_smart_smart_del(Eo *obj, Elm_Thumb_Data *sd)
+_elm_thumb_efl_canvas_group_group_del(Eo *obj, Elm_Thumb_Data *sd)
{
if (sd->thumb.request)
{
@@ -568,7 +568,7 @@ _elm_thumb_evas_object_smart_smart_del(Eo *obj, Elm_Thumb_Data *sd)
ecore_event_handler_del(sd->eeh);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index b3d7837cfc..160442103c 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -10,10 +10,10 @@ class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
Eo.Base.constructor;
Efl.File.file.set;
Efl.File.file.get;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_show;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_show;
Efl.Ui.Draggable.drag_target.set;
Efl.Ui.Draggable.drag_target.get;
}
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 4f0d3aa82a..787ce908db 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -2807,7 +2807,7 @@ _elm_toolbar_action_down_cb(void *data,
}
EOLIAN static void
-_elm_toolbar_evas_object_smart_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
+_elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
{
Evas_Object *edje;
@@ -2816,7 +2816,7 @@ _elm_toolbar_evas_object_smart_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
edje = edje_object_add(evas_object_evas_get(obj));
elm_widget_resize_object_set(obj, edje, EINA_TRUE);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_theme_object_set
(obj, edje, "toolbar", "base", elm_widget_style_get(obj));
@@ -2909,7 +2909,7 @@ _elm_toolbar_evas_object_smart_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
}
EOLIAN static void
-_elm_toolbar_evas_object_smart_smart_del(Eo *obj, Elm_Toolbar_Data *sd)
+_elm_toolbar_efl_canvas_group_group_del(Eo *obj, Elm_Toolbar_Data *sd)
{
Elm_Toolbar_Item_Data *it, *next;
@@ -2928,29 +2928,29 @@ _elm_toolbar_evas_object_smart_smart_del(Eo *obj, Elm_Toolbar_Data *sd)
if (sd->more_item) elm_wdg_item_del(EO_OBJ(sd->more_item));
ecore_timer_del(sd->long_timer);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_elm_toolbar_evas_object_smart_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_toolbar_efl_canvas_group_group_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y)
{
- evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
evas_object_move(sd->hit_rect, x, y);
}
EOLIAN static void
-_elm_toolbar_evas_object_smart_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_toolbar_efl_canvas_group_group_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h)
{
- evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h);
}
EOLIAN static void
-_elm_toolbar_evas_object_smart_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member)
+_elm_toolbar_efl_canvas_group_group_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
@@ -4118,7 +4118,7 @@ _elm_toolbar_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, E
}
EOLIAN void
-_elm_toolbar_evas_object_smart_smart_calculate(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED)
+_elm_toolbar_efl_canvas_group_group_calculate(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED)
{
_sizing_eval(obj);
}
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 4978281437..f508135acc 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -345,12 +345,12 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_resize;
Elm.Widget.focus_next_manager_is;
Elm.Widget.access;
Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c
index 99b21ed5c6..b52d6fdf3d 100644
--- a/src/lib/elementary/elm_video.c
+++ b/src/lib/elementary/elm_video.c
@@ -248,11 +248,11 @@ _elm_video_check(Evas_Object *video)
}
EOLIAN static void
-_elm_video_evas_object_smart_smart_add(Eo *obj, Elm_Video_Data *priv)
+_elm_video_efl_canvas_group_group_add(Eo *obj, Elm_Video_Data *priv)
{
_elm_emotion_init();
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -274,12 +274,12 @@ _elm_video_evas_object_smart_smart_add(Eo *obj, Elm_Video_Data *priv)
}
EOLIAN static void
-_elm_video_evas_object_smart_smart_del(Eo *obj, Elm_Video_Data *sd)
+_elm_video_efl_canvas_group_group_del(Eo *obj, Elm_Video_Data *sd)
{
ecore_timer_del(sd->timer);
if (sd->remember) emotion_object_last_position_save(sd->emotion);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo
index b76deb94a7..cda43aef37 100644
--- a/src/lib/elementary/elm_video.eo
+++ b/src/lib/elementary/elm_video.eo
@@ -65,8 +65,8 @@ class Elm.Video (Elm.Layout, Efl.File,
Eo.Base.constructor;
Efl.File.file.set;
Efl.File.file.get;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.event;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index f55fcfdf34..4155698d53 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -348,7 +348,7 @@ _obj_mouse_in(void *data,
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_add(Eo *obj, Elm_Widget_Smart_Data *priv)
+_elm_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv)
{
priv->obj = obj;
@@ -428,7 +428,7 @@ _if_focused_revert(Evas_Object *obj,
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_del(Eo *obj, Elm_Widget_Smart_Data *sd)
+_elm_widget_efl_canvas_group_group_del(Eo *obj, Elm_Widget_Smart_Data *sd)
{
Evas_Object *sobj;
Elm_Translate_String_Data *ts;
@@ -495,7 +495,7 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd)
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y)
+_elm_widget_efl_canvas_group_group_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y)
{
sd->x = x;
sd->y = y;
@@ -504,7 +504,7 @@ _elm_widget_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_D
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord w, Evas_Coord h)
+_elm_widget_efl_canvas_group_group_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord w, Evas_Coord h)
{
sd->w = w;
sd->h = h;
@@ -513,7 +513,7 @@ _elm_widget_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd)
+_elm_widget_efl_canvas_group_group_show(Eo *obj, Elm_Widget_Smart_Data *_pd)
{
Eina_Iterator *it;
Evas_Object *o;
@@ -535,7 +535,7 @@ _elm_widget_evas_object_smart_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd)
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd)
+_elm_widget_efl_canvas_group_group_hide(Eo *obj, Elm_Widget_Smart_Data *_pd)
{
Eina_Iterator *it;
Evas_Object *o;
@@ -553,7 +553,7 @@ _elm_widget_evas_object_smart_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd)
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, int r, int g, int b, int a)
+_elm_widget_efl_canvas_group_group_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, int r, int g, int b, int a)
{
Eina_Iterator *it;
Evas_Object *o;
@@ -568,7 +568,7 @@ _elm_widget_evas_object_smart_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_p
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide)
+_elm_widget_efl_canvas_group_group_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide)
{
Eina_Iterator *it;
Evas_Object *o;
@@ -583,7 +583,7 @@ _elm_widget_evas_object_smart_smart_no_render_set(Eo *obj, Elm_Widget_Smart_Data
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip)
+_elm_widget_efl_canvas_group_group_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip)
{
Eina_Iterator *it;
Evas_Object *o;
@@ -598,7 +598,7 @@ _elm_widget_evas_object_smart_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
+_elm_widget_efl_canvas_group_group_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
Eina_Iterator *it;
Evas_Object *o;
@@ -613,16 +613,16 @@ _elm_widget_evas_object_smart_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
+_elm_widget_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
/* a NO-OP, on the base */
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
+_elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
{
int r, g, b, a;
- evas_obj_smart_member_add(eo_super(obj, MY_CLASS), child);
+ efl_canvas_group_member_add(eo_super(obj, MY_CLASS), child);
if (evas_object_data_get(child, "_elm_leaveme")) return;
@@ -639,11 +639,11 @@ _elm_widget_evas_object_smart_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_
}
EOLIAN static void
-_elm_widget_evas_object_smart_smart_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
+_elm_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
{
if (!evas_object_data_get(child, "_elm_leaveme"))
evas_object_clip_unset(child);
- evas_obj_smart_member_del(eo_super(obj, MY_CLASS), child);
+ efl_canvas_group_member_del(eo_super(obj, MY_CLASS), child);
}
// internal funcs
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 72a2e5b831..f3c9f9aa1b 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -21,7 +21,7 @@ struct Elm.Tooltip;
struct Elm.Cursor;
struct @extern Elm.Theme;
-abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Interface.Atspi_Component)
+abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Interface.Atspi_Component)
{
legacy_prefix: elm_widget;
eo_prefix: elm_obj_widget;
@@ -37,7 +37,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
the focus from this object, passing it back to the previous element in the
focus chain list.
- Warning: Only visible object can get a focus. Call @Evas.Object.Smart.smart_show
+ Warning: Only visible object can get a focus. Call @Efl.Canvas.Group.group_show
before calling this API, if you want to give a focus to the evas object.]]
set {
[[$true set the focus to the object,
@@ -851,19 +851,19 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
Eo.Base.destructor;
Eo.Base.dbg_info_get;
Eo.Base.provider_find;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_clip_unset;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_color.set;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_member_del;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_clip.set;
- Evas.Object.Smart.smart_member_add;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_no_render.set;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_clip_unset;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_color.set;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_member_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_clip.set;
+ Efl.Canvas.Group.group_member_add;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_no_render.set;
Elm.Interface.Atspi_Accessible.name.get;
Elm.Interface.Atspi_Accessible.state_set.get;
Elm.Interface.Atspi_Accessible.children.get;
diff --git a/src/lib/emotion/emotion_object.eo b/src/lib/emotion/emotion_object.eo
index 8ebdbedd89..5b9f2894e4 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -1,4 +1,4 @@
-class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) {
+class Emotion.Object (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) {
legacy_prefix: emotion_object;
eo_prefix: emotion_obj;
event_prefix: emotion_object;
@@ -54,15 +54,15 @@ class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Im
}
implements {
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_color.set;
- Evas.Object.Smart.smart_clip.set;
- Evas.Object.Smart.smart_clip_unset;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_color.set;
+ Efl.Canvas.Group.group_clip.set;
+ Efl.Canvas.Group.group_clip_unset;
Efl.File.file.set;
Efl.File.file.get;
Efl.Player.play.set;
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 3df5b60846..1b3364ca07 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -1829,7 +1829,7 @@ _pixels_get(void *data, Evas_Object *obj)
/*******************************************/
EOLIAN static void
-_emotion_object_evas_object_smart_smart_add(Evas_Object *obj, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_add(Evas_Object *obj, Emotion_Object_Data *sd)
{
unsigned int *pixel;
@@ -1864,7 +1864,7 @@ _emotion_object_evas_object_smart_smart_add(Evas_Object *obj, Emotion_Object_Dat
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
if (!sd) return;
if (sd->engine_instance)
@@ -1895,7 +1895,7 @@ _emotion_object_evas_object_smart_smart_del(Evas_Object *obj EINA_UNUSED, Emotio
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y)
+_emotion_object_efl_canvas_group_group_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y)
{
int w, h;
@@ -1905,14 +1905,14 @@ _emotion_object_evas_object_smart_smart_move(Evas_Object *obj, Emotion_Object_Da
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h)
+_emotion_object_efl_canvas_group_group_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h)
{
_emotion_object_aspect_border_apply(obj, sd, w, h);
evas_object_resize(sd->bg, w, h);
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
int a;
@@ -1924,7 +1924,7 @@ _emotion_object_evas_object_smart_smart_show(Evas_Object *obj EINA_UNUSED, Emoti
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
evas_object_hide(sd->obj);
if (sd->crop.clipper) evas_object_hide(sd->crop.clipper);
@@ -1932,14 +1932,14 @@ _emotion_object_evas_object_smart_smart_hide(Evas_Object *obj EINA_UNUSED, Emoti
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_color_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, int r, int g, int b, int a)
+_emotion_object_efl_canvas_group_group_color_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, int r, int g, int b, int a)
{
evas_object_color_set(sd->obj, r, g, b, a);
evas_object_color_set(sd->crop.clipper, r, g, b, a);
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip)
+_emotion_object_efl_canvas_group_group_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip)
{
if (sd->crop.clipper) evas_object_clip_set(sd->crop.clipper, clip);
else evas_object_clip_set(sd->obj, clip);
@@ -1947,7 +1947,7 @@ _emotion_object_evas_object_smart_smart_clip_set(Evas_Object *obj EINA_UNUSED, E
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
if (sd->crop.clipper) evas_object_clip_unset(sd->crop.clipper);
else evas_object_clip_unset(sd->obj);
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index e8b4e91f1c..cde534e39c 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -47,7 +47,7 @@
*
* @{
*/
-#include "canvas/evas_object_smart.eo.h"
+#include "canvas/efl_canvas_group.eo.h"
/**
* @}
*/
@@ -57,7 +57,7 @@
*
* @{
*/
-#include "canvas/efl_canvas_object_internal_smart_clipped.eo.h"
+#include "canvas/efl_canvas_group_clipped.eo.h"
/**
* @}
*/
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 694902b1ef..4b8b88fc44 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -5210,8 +5210,8 @@ EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj)
*
* This function will return @c null when a non-smart object is passed.
*
- * See also @ref Evas.Object.Smart.smart_member_add,
- * @ref Evas.Object.Smart.smart_member_del and @ref evas_object_smart_iterator_new.
+ * See also @ref Efl.Canvas.Group.group_member_add,
+ * @ref Efl.Canvas.Group.group_member_del and @ref evas_object_smart_iterator_new.
*
* @return Returns the list of the member objects of @c obj.
*
@@ -5222,6 +5222,110 @@ EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj)
EAPI Eina_List *evas_object_smart_members_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
/**
+ * @brief Set or unset the flag signalling that a given smart object needs to
+ * get recalculated.
+ *
+ * If this flag is set, then the @c calculate() smart function of @c obj will
+ * be called, if one is provided, during rendering phase of Evas (see
+ * evas_render()), after which this flag will be automatically unset.
+ *
+ * If that smart function is not provided for the given object, this flag will
+ * be left unchanged.
+ *
+ * @note just setting this flag will not make the canvas' whole scene dirty, by
+ * itself, and evas_render() will have no effect. To force that, use
+ * evas_object_smart_changed(), that will also call this function
+ * automatically, with @c true as parameter.
+ *
+ * See also @ref evas_object_smart_need_recalculate_get,
+ * @ref evas_object_smart_calculate and @ref evas_smart_objects_calculate().
+ *
+ * @param[in] value whether one wants to set ($true) or to unset ($false) the
+ * flag.
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI void evas_object_smart_need_recalculate_set(Evas_Object *obj, Eina_Bool value);
+
+/**
+ * @brief Get the value of the flag signalling that a given smart object needs
+ * to get recalculated.
+ *
+ * @note this flag will be unset during the rendering phase, when the
+ * @c calculate() smart function is called, if one is provided. If it's not
+ * provided, then the flag will be left unchanged after the rendering phase.
+ *
+ * See also @ref evas_object_smart_need_recalculate_set, for more details.
+ *
+ * @return whether one wants to set ($true) or to unset ($false) the flag.
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Evas_Object *obj);
+
+/**
+ * @brief Retrieves an iterator of the member objects of a given Evas smart
+ * object.
+ *
+ * See also @ref Efl.Canvas.Group.group_member_add and
+ * @ref Efl.Canvas.Group.group_member_del
+ *
+ * @return Returns the iterator of the member objects of @c obj.
+ *
+ * @since 1.8
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI Eina_Iterator *evas_object_smart_iterator_new(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
+
+/**
+ * @brief Call the calculate() smart function immediately on a given smart
+ * object.
+ *
+ * This will force immediate calculations (see #Evas_Smart_Class) needed for
+ * renderization of this object and, besides, unset the flag on it telling it
+ * needs recalculation for the next rendering phase.
+ *
+ * See also @ref evas_object_smart_need_recalculate_set
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI void evas_object_smart_calculate(Evas_Object *obj);
+
+/**
+ * @brief Mark smart object as changed, dirty.
+ *
+ * This will flag the given object as needing recalculation, forcefully. As an
+ * effect, on the next rendering cycle its calculate() (see #Evas_Smart_Class)
+ * smart function will be called.
+ *
+ * See also @ref evas_object_smart_need_recalculate_set and
+ * @ref evas_object_smart_calculate.
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI void evas_object_smart_changed(Evas_Object *obj);
+
+/**
+ * @brief Moves all children objects of a given smart object relative to a
+ * given offset.
+ *
+ * This will make each of @c obj object's children to move, from where they
+ * before, with those delta values (offsets) on both directions.
+ *
+ * @note This is most useful on custom smart @c move functions.
+ *
+ * @note Clipped smart objects already make use of this function on their
+ * @c move smart function definition.
+ *
+ * @param[in] dx Horizontal offset (delta).
+ * @param[in] dy Vertical offset (delta).
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy);
+
+/**
* This gets the internal counter that counts the number of smart calculations
*
* @param e The canvas to get the calculate counter from
@@ -5239,7 +5343,7 @@ EAPI Eina_List *evas_object_smart_members_get(const Evas_Object *obj) EINA_WARN_
*/
EAPI int evas_smart_objects_calculate_count_get(const Evas *e);
-#include "canvas/evas_object_smart.eo.legacy.h"
+#include "canvas/efl_canvas_group.eo.legacy.h"
/**
* @}
@@ -5264,7 +5368,7 @@ EAPI int evas_smart_objects_calculate_count_get(const Evas *e);
*/
EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
-#include "canvas/efl_canvas_object_internal_smart_clipped.eo.legacy.h"
+#include "canvas/efl_canvas_group_clipped.eo.legacy.h"
/**
* @}
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
new file mode 100644
index 0000000000..5a1a4050e8
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -0,0 +1,190 @@
+class Efl.Canvas.Group (Evas.Object)
+{
+ [[A group object is a container of other canvas objects. Its children
+ move along their parent, are often clipped with a common clipper.
+ This is part of the legacy smart object concept.
+
+ A group is not necessarily a container (see $Efl.Container), in the
+ sense that a standard widget may not have any empty slots for content,
+ but is still a group of low-level canvas objects (clipper, raw objects,
+ etc...).
+ ]]
+ legacy_prefix: evas_object_smart;
+ data: Evas_Smart_Data;
+ methods {
+ @property group_need_recalculate {
+ [[Indicates that the group's layout need to be recalculated.
+
+ If this flag is set, then the @.group_calculate function will
+ be called, during rendering phase of the canvas. After that,
+ this flag will be automatically unset.
+
+ Note: just setting this flag will not make the canvas' whole scene
+ dirty, by itself, and evas_render() will have no effect. To
+ force that, use @.group_change, that will also call this function
+ automatically, with $true as parameter.
+
+ See also @.group_calculate.
+ ]]
+ set {
+ legacy: evas_object_smart_need_recalculate_set;
+ }
+ get {
+ legacy: evas_object_smart_need_recalculate_get;
+ }
+ values {
+ value: bool;
+ }
+ }
+ group_change {
+ [[Marks the object as dirty.
+
+ This also forcefully marks the given object as needing
+ recalculation. As an effect, on the next rendering cycle its
+ @.group_calculate method will be called.
+ ]]
+ legacy: evas_object_smart_changed;
+ }
+ group_children_move {
+ [[Move all children of this object using relative coordinates.
+
+ This will make each children move, from where they before, by
+ a certain delta (offsets) in both directions.
+
+ Note: Clipped smart objects already make use of this function on
+ their $move smart function definition.
+ ]]
+ params {
+ @in dx: int; [[Horizontal offset (delta).]]
+ @in dy: int; [[Vertical offset (delta).]]
+ }
+ legacy: evas_object_smart_move_children_relative;
+ }
+ group_calculate {
+ [[Triggers an immediate recalculation of this object's geometry.
+
+ This will also reset the flag @.group_need_recalculate.
+ ]]
+ legacy: evas_object_smart_calculate;
+ }
+ group_children_iterate @const {
+ [[Returns an iterator over the children of this object, that are
+ canvas objects.
+
+ This returns the list of "smart" children. This might be different
+ from both the $Eo.Base children list as well as the $Efl.Container
+ content list.
+ ]]
+ return: free(own(iterator<Efl.Gfx>), eina_iterator_free);
+ legacy: evas_object_smart_iterator_new;
+ }
+ @property group_clip {
+ set {
+ [[No description supplied by the EAPI.]]
+ legacy: null;
+ }
+ values {
+ clip: Evas.Object;
+ }
+ }
+ @property group_color {
+ set {
+ [[No description supplied by the EAPI.]]
+ legacy: null;
+ }
+ values {
+ r: int;
+ g: int;
+ b: int;
+ a: int;
+ }
+ }
+ group_show {
+ [[No description supplied by the EAPI.]]
+ legacy: null;
+ }
+ group_move {
+ [[No description supplied by the EAPI.]]
+ legacy: null;
+ params {
+ @in x: Evas.Coord;
+ @in y: Evas.Coord;
+ }
+ }
+ @property group_no_render {
+ [[Propagates the value of no-render to the smart children.]]
+ set { legacy: null; }
+ values { hide: bool; }
+ }
+ group_hide {
+ [[No description supplied by the EAPI.]]
+ legacy: null;
+ }
+ group_add {
+ [[Instantiates a new smart object described by $s.
+
+ This is the function one should use when defining the public
+ function adding an instance of the new smart object to a given
+ canvas. It will take care of setting all of its internals to work
+ as they should, if the user set things properly, as seem on the
+ #EVAS_SMART_SUBCLASS_NEW, for example.]]
+ legacy: null;
+ }
+ group_member_add {
+ [[Set an Evas object as a member of a given smart object.
+
+ Members will automatically be stacked and layered together with the
+ smart object. The various stacking functions will operate on
+ members relative to the other members instead of the entire canvas,
+ since they now live on an exclusive layer (see
+ evas_object_stack_above(), for more details).
+
+ Any $smart_obj object's specific implementation of the
+ $member_add() smart function will take place too, naturally.
+
+ See also @.group_member_del.]]
+
+ params {
+ @in sub_obj: Evas.Object @nonull; [[The member object.]]
+ }
+ legacy: null;
+ }
+ group_resize {
+ [[No description supplied by the EAPI.]]
+ legacy: null;
+ params {
+ @in w: Evas.Coord;
+ @in h: Evas.Coord;
+ }
+ }
+ group_clip_unset {
+ [[No description supplied by the EAPI.]]
+ legacy: null;
+ }
+ group_member_del {
+ [[Removes a member object from a given smart object.
+
+ This removes a member object from a smart object, if it was added
+ to any. The object will still be on the canvas, but no longer
+ associated with whichever smart object it was associated with.
+
+ See also @.group_member_add for more details.]]
+
+ params {
+ @in sub_obj: Evas.Object; [[the member object.]]
+ }
+ legacy: null;
+ }
+ group_del {
+ [[Deletes a smart object.]]
+ legacy: null;
+ }
+ }
+ implements {
+ class.constructor;
+ class.destructor;
+ Eo.Base.constructor;
+ Evas.Object.paragraph_direction.set;
+ Evas.Object.paragraph_direction.get;
+ }
+}
diff --git a/src/lib/evas/canvas/efl_canvas_group_clipped.eo b/src/lib/evas/canvas/efl_canvas_group_clipped.eo
new file mode 100644
index 0000000000..eb5a7b1b80
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_group_clipped.eo
@@ -0,0 +1,17 @@
+abstract Efl.Canvas.Group.Clipped (Efl.Canvas.Group)
+{
+ [[Internal class representing a canvas object group with a clipper.]]
+ data: Evas_Object_Smart_Clipped_Data;
+ implements {
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_clip.set;
+ Efl.Canvas.Group.group_clip_unset;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_color.set;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_member_del;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_member_add;
+ }
+}
diff --git a/src/lib/evas/canvas/efl_canvas_object_internal_smart_clipped.eo b/src/lib/evas/canvas/efl_canvas_object_internal_smart_clipped.eo
deleted file mode 100644
index d45e9284bc..0000000000
--- a/src/lib/evas/canvas/efl_canvas_object_internal_smart_clipped.eo
+++ /dev/null
@@ -1,17 +0,0 @@
-abstract Efl.Canvas.Object.Internal.Smart.Clipped (Evas.Object.Smart)
-{
- [[Internal class representing a canvas object group with a clipper.]]
- data: Evas_Object_Smart_Clipped_Data;
- implements {
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_clip.set;
- Evas.Object.Smart.smart_clip_unset;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_color.set;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_member_del;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_member_add;
- }
-}
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index ad1c92f514..5f352afd58 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -4,7 +4,7 @@ type @extern Evas_Object_Box_Layout: __undefined_type; /* FIXME: Function pointe
type @extern Eina_Free_Cb: __undefined_type; /* FIXME: Function pointers are not supported */
type @extern va_list: __undefined_type; /* FIXME: va_list is not supported */
-class Evas.Box (Efl.Canvas.Object.Internal.Smart.Clipped)
+class Evas.Box (Efl.Canvas.Group.Clipped)
{
legacy_prefix: evas_object_box;
eo_prefix: evas_obj_box;
@@ -657,10 +657,10 @@ class Evas.Box (Efl.Canvas.Object.Internal.Smart.Clipped)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
}
events {
child,added;
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index da471a64eb..8348e2ae38 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -279,7 +279,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *
}
if (obj->is_smart)
{
- evas_obj_smart_clip_set(eo_obj, eo_clip);
+ efl_canvas_group_clip_set(eo_obj, eo_clip);
}
if (obj->cur->clipper)
{
@@ -413,7 +413,7 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
if (evas_object_intercept_call_clip_unset(eo_obj, obj)) return;
if (obj->is_smart)
{
- evas_obj_smart_clip_unset(eo_obj);
+ efl_canvas_group_clip_unset(eo_obj);
}
if (obj->cur->clipper)
{
@@ -596,7 +596,7 @@ _evas_object_no_render_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Boo
{
obj->no_render = enable;
if (obj->is_smart)
- evas_obj_smart_no_render_set(eo_obj, enable);
+ efl_canvas_group_no_render_set(eo_obj, enable);
}
EOLIAN Eina_Bool
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 39ac187d46..b65ac05212 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -1,4 +1,4 @@
-class Evas.Grid (Efl.Canvas.Object.Internal.Smart.Clipped)
+class Evas.Grid (Efl.Canvas.Group.Clipped)
{
legacy_prefix: evas_object_grid;
eo_prefix: evas_obj_grid;
diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index 373d055dfe..f3933c81b9 100644
--- a/src/lib/evas/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
@@ -44,7 +44,7 @@ _priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, i
const Eina_Inlist *lst;
Evas_Object_Protected_Data *child;
- if (!eo_isa(eo_obj, EVAS_OBJECT_SMART_CLASS)) return NULL;
+ if (!eo_isa(eo_obj, EFL_CANVAS_GROUP_CLASS)) return NULL;
lst = evas_object_smart_members_get_direct(eo_obj);
EINA_INLIST_FOREACH(lst, child)
{
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index ecf14379ae..7a3a3e58fe 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -384,9 +384,9 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos
}
EOLIAN static void
-_evas_box_evas_object_smart_smart_add(Eo *o, Evas_Object_Box_Data *priv)
+_evas_box_efl_canvas_group_group_add(Eo *o, Evas_Object_Box_Data *priv)
{
- evas_obj_smart_add(eo_super(o, MY_CLASS));
+ efl_canvas_group_add(eo_super(o, MY_CLASS));
evas_object_event_callback_add
(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_hints_changed, o);
@@ -401,7 +401,7 @@ _evas_box_evas_object_smart_smart_add(Eo *o, Evas_Object_Box_Data *priv)
}
EOLIAN static void
-_evas_box_evas_object_smart_smart_del(Eo *o, Evas_Object_Box_Data *priv)
+_evas_box_efl_canvas_group_group_del(Eo *o, Evas_Object_Box_Data *priv)
{
Eina_List *l;
@@ -418,11 +418,11 @@ _evas_box_evas_object_smart_smart_del(Eo *o, Evas_Object_Box_Data *priv)
if (priv->layout.data && priv->layout.free_data)
priv->layout.free_data(priv->layout.data);
- evas_obj_smart_del(eo_super(o, MY_CLASS));
+ efl_canvas_group_del(eo_super(o, MY_CLASS));
}
EOLIAN static void
-_evas_box_evas_object_smart_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
+_evas_box_efl_canvas_group_group_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
{
Evas_Coord ow, oh;
evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
@@ -431,7 +431,7 @@ _evas_box_evas_object_smart_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_U
}
EOLIAN static void
-_evas_box_evas_object_smart_smart_calculate(Eo *o, Evas_Object_Box_Data *priv)
+_evas_box_efl_canvas_group_group_calculate(Eo *o, Evas_Object_Box_Data *priv)
{
if (priv->layout.cb)
{
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 6398ce8984..cf55600fd5 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -903,7 +903,7 @@ _evas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
if (obj->is_smart)
{
- evas_obj_smart_move(eo_obj, x, y);
+ efl_canvas_group_move(eo_obj, x, y);
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
@@ -986,7 +986,7 @@ _evas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
if (obj->is_smart)
{
- evas_obj_smart_resize(eo_obj, w, h);
+ efl_canvas_group_resize(eo_obj, w, h);
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
@@ -1401,7 +1401,7 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
if (evas_object_intercept_call_show(eo_obj, obj)) return;
if (obj->is_smart)
{
- evas_obj_smart_show(eo_obj);
+ efl_canvas_group_show(eo_obj);
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
{
@@ -1450,7 +1450,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
if (evas_object_intercept_call_hide(eo_obj, obj)) return;
if (obj->is_smart)
{
- evas_obj_smart_hide(eo_obj);
+ efl_canvas_group_hide(eo_obj);
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
@@ -1604,7 +1604,7 @@ _evas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
if (evas_object_intercept_call_color_set(eo_obj, obj, r, g, b, a)) return;
if (obj->is_smart)
{
- evas_obj_smart_color_set(eo_obj, r, g, b, a);
+ efl_canvas_group_color_set(eo_obj, r, g, b, a);
}
if ((obj->cur->color.r == r) &&
(obj->cur->color.g == g) &&
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index acb712274f..6edcf10794 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1,14 +1,14 @@
#include "evas_common_private.h"
#include "evas_private.h"
-#define MY_CLASS EVAS_OBJECT_SMART_CLASS
+#define MY_CLASS EFL_CANVAS_GROUP_CLASS
#define MY_CLASS_NAME "Evas_Smart"
#define MY_CLASS_NAME_LEGACY "Evas_Object_Smart"
#define EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, ...) \
- Evas_Smart_Data *o = eo_isa(eo_obj, EVAS_OBJECT_SMART_CLASS) ? \
- eo_data_scope_get(eo_obj, EVAS_OBJECT_SMART_CLASS) : NULL; \
+ Evas_Smart_Data *o = eo_isa(eo_obj, EFL_CANVAS_GROUP_CLASS) ? \
+ eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS) : NULL; \
do { if (!o) { MAGIC_CHECK_FAILED(eo_obj,0,MAGIC_SMART) return __VA_ARGS__; } } while (0)
extern Eina_Hash* signals_hash_table;
@@ -88,7 +88,7 @@ static void evas_object_smart_render_post(Evas_Object *eo_obj,
static unsigned int evas_object_smart_id_get(Evas_Object *eo_obj);
static unsigned int evas_object_smart_visual_id_get(Evas_Object *eo_obj);
static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj);
-static void _evas_object_smart_smart_paragraph_direction_set_internal(Eo *eo_obj,
+static void _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj,
Evas_BiDi_Direction dir);
static const Evas_Object_Func object_func =
@@ -147,7 +147,7 @@ evas_object_smart_interface_get(const Evas_Object *eo_obj,
return NULL;
MAGIC_CHECK_END();
- if (!eo_isa(eo_obj, EVAS_OBJECT_SMART_CLASS)) return NULL;
+ if (!eo_isa(eo_obj, EFL_CANVAS_GROUP_CLASS)) return NULL;
s = evas_object_smart_smart_get(eo_obj);
if (!s) return NULL;
@@ -197,7 +197,7 @@ evas_object_smart_interface_data_get(const Evas_Object *eo_obj,
}
EAPI Evas_Smart*
-evas_object_smart_smart_get(const Evas_Object_Smart *eo_obj)
+evas_object_smart_smart_get(const Efl_Canvas_Group *eo_obj)
{
Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, NULL);
return obj->smart.smart;
@@ -209,11 +209,11 @@ evas_object_smart_member_add(Evas_Object *eo_obj, Evas_Object *smart_obj)
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- evas_obj_smart_member_add(smart_obj, eo_obj);
+ efl_canvas_group_member_add(smart_obj, eo_obj);
}
EOLIAN static void
-_evas_object_smart_smart_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj)
+_efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -272,13 +272,13 @@ _evas_object_smart_smart_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Obje
if (obj->is_smart)
{
- member_o = eo_data_scope_get(eo_obj, EVAS_OBJECT_SMART_CLASS);
+ member_o = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS);
if ((member_o->inherit_paragraph_direction) &&
(member_o->paragraph_direction != o->paragraph_direction))
{
member_o->paragraph_direction = o->paragraph_direction;
- _evas_object_smart_smart_paragraph_direction_set_internal(eo_obj, o->paragraph_direction);
+ _efl_canvas_group_group_paragraph_direction_set_internal(eo_obj, o->paragraph_direction);
}
}
@@ -300,11 +300,11 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
if (!obj->smart.parent) return;
Evas_Object *smart_obj = obj->smart.parent;
- evas_obj_smart_member_del(smart_obj, eo_obj);
+ efl_canvas_group_member_del(smart_obj, eo_obj);
}
EOLIAN static void
-_evas_object_smart_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj)
+_efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
Evas_Smart_Data *member_o;
@@ -332,13 +332,13 @@ _evas_object_smart_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNU
if (obj->is_smart)
{
- member_o = eo_data_scope_get(eo_obj, EVAS_OBJECT_SMART_CLASS);
+ member_o = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS);
if ((member_o->inherit_paragraph_direction) &&
(member_o->paragraph_direction != EVAS_BIDI_DIRECTION_NEUTRAL))
{
member_o->paragraph_direction = EVAS_BIDI_DIRECTION_NEUTRAL;
- _evas_object_smart_smart_paragraph_direction_set_internal(eo_obj, EVAS_BIDI_DIRECTION_NEUTRAL);
+ _efl_canvas_group_group_paragraph_direction_set_internal(eo_obj, EVAS_BIDI_DIRECTION_NEUTRAL);
}
}
@@ -413,7 +413,7 @@ evas_smart_legacy_type_register(const char *type, const Eo_Class *klass)
}
static Eina_Bool
-_evas_object_smart_smart_iterator_next(Evas_Object_Smart_Iterator *it, void **data)
+_efl_canvas_group_group_iterator_next(Evas_Object_Smart_Iterator *it, void **data)
{
Evas_Object *eo;
@@ -428,13 +428,13 @@ _evas_object_smart_smart_iterator_next(Evas_Object_Smart_Iterator *it, void **da
}
static Evas_Object *
-_evas_object_smart_smart_iterator_get_container(Evas_Object_Smart_Iterator *it)
+_efl_canvas_group_group_iterator_get_container(Evas_Object_Smart_Iterator *it)
{
return it->parent;
}
static void
-_evas_object_smart_smart_iterator_free(Evas_Object_Smart_Iterator *it)
+_efl_canvas_group_group_iterator_free(Evas_Object_Smart_Iterator *it)
{
eo_unref(it->parent);
free(it);
@@ -442,7 +442,7 @@ _evas_object_smart_smart_iterator_free(Evas_Object_Smart_Iterator *it)
// Should we have an eo_children_iterator_new API and just inherit from it ?
EOLIAN static Eina_Iterator*
-_evas_object_smart_smart_iterator_new(const Eo *eo_obj, Evas_Smart_Data *priv)
+_efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv)
{
Evas_Object_Smart_Iterator *it;
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -457,9 +457,9 @@ _evas_object_smart_smart_iterator_new(const Eo *eo_obj, Evas_Smart_Data *priv)
it->parent = eo_ref(eo_obj);
it->current = priv->contained;
- it->iterator.next = FUNC_ITERATOR_NEXT(_evas_object_smart_smart_iterator_next);
- it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_evas_object_smart_smart_iterator_get_container);
- it->iterator.free = FUNC_ITERATOR_FREE(_evas_object_smart_smart_iterator_free);
+ it->iterator.next = FUNC_ITERATOR_NEXT(_efl_canvas_group_group_iterator_next);
+ it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_efl_canvas_group_group_iterator_get_container);
+ it->iterator.free = FUNC_ITERATOR_FREE(_efl_canvas_group_group_iterator_free);
return &it->iterator;
}
@@ -489,7 +489,7 @@ evas_object_smart_members_get_direct(const Evas_Object *eo_obj)
}
void
-_evas_object_smart_smart_members_all_del(Evas_Object *eo_obj)
+_efl_canvas_group_group_members_all_del(Evas_Object *eo_obj)
{
Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
Evas_Object_Protected_Data *memobj;
@@ -576,13 +576,13 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- eo_obj = eo_add(EVAS_OBJECT_SMART_CLASS, eo_e);
+ eo_obj = eo_add(EFL_CANVAS_GROUP_CLASS, eo_e);
evas_object_smart_attach(eo_obj, s);
return eo_obj;
}
EOLIAN static Eo *
-_evas_object_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
+_efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
{
Evas_Smart_Data *smart;
@@ -594,13 +594,13 @@ _evas_object_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data E
evas_object_smart_init(eo_obj);
evas_obj_type_set(eo_obj, MY_CLASS_NAME_LEGACY);
- evas_obj_smart_add(eo_obj);
+ efl_canvas_group_add(eo_obj);
return eo_obj;
}
EOLIAN static void
-_evas_object_smart_smart_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
+_efl_canvas_group_group_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -610,12 +610,12 @@ _evas_object_smart_smart_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
}
EOLIAN static void
-_evas_object_smart_smart_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED)
+_efl_canvas_group_group_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED)
{
}
EOLIAN static void
-_evas_object_smart_smart_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord w, Evas_Coord h)
+_efl_canvas_group_group_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord w, Evas_Coord h)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -625,7 +625,7 @@ _evas_object_smart_smart_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas
}
EOLIAN static void
-_evas_object_smart_smart_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord x, Evas_Coord y)
+_efl_canvas_group_group_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord x, Evas_Coord y)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -635,7 +635,7 @@ _evas_object_smart_smart_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_C
}
EOLIAN static void
-_evas_object_smart_smart_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
+_efl_canvas_group_group_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -645,7 +645,7 @@ _evas_object_smart_smart_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
}
EOLIAN static void
-_evas_object_smart_smart_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
+_efl_canvas_group_group_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -655,7 +655,7 @@ _evas_object_smart_smart_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
}
EOLIAN static void
-_evas_object_smart_smart_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, int r, int g, int b, int a)
+_efl_canvas_group_group_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, int r, int g, int b, int a)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -665,7 +665,7 @@ _evas_object_smart_smart_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, i
}
EOLIAN static void
-_evas_object_smart_smart_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Object *clip)
+_efl_canvas_group_group_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Object *clip)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -675,7 +675,7 @@ _evas_object_smart_smart_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Ev
}
EOLIAN static void
-_evas_object_smart_smart_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
+_efl_canvas_group_group_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
{
// If this function is reached, so we do nothing except trying to call
// the function of the legacy smart class.
@@ -685,14 +685,14 @@ _evas_object_smart_smart_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
}
EOLIAN static void
-_evas_object_smart_smart_no_render_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Eina_Bool hide)
+_efl_canvas_group_group_no_render_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Eina_Bool hide)
{
Evas_Object_Protected_Data *obj2;
Evas_Object_Smart_Clipped_Data *cso;
Evas_Object *cso_clipper;
- if (eo_isa(eo_obj, EFL_CANVAS_OBJECT_INTERNAL_SMART_CLIPPED_CLASS))
- cso = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_INTERNAL_SMART_CLIPPED_CLASS);
+ if (eo_isa(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS))
+ cso = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
else
cso = evas_object_smart_data_get(eo_obj);
cso_clipper = cso ? cso->clipper : NULL;
@@ -732,7 +732,7 @@ evas_object_smart_attach(Evas_Object *eo_obj, Evas_Smart *s)
}
}
- evas_obj_smart_add(eo_obj);
+ efl_canvas_group_add(eo_obj);
}
EAPI void
@@ -910,7 +910,7 @@ evas_object_smart_callback_description_find(const Eo *eo_obj, const char *name,
}
EOLIAN static void
-_evas_object_smart_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value)
+_efl_canvas_group_group_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -940,13 +940,13 @@ _evas_object_smart_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Ei
}
EOLIAN static Eina_Bool
-_evas_object_smart_smart_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
+_efl_canvas_group_group_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
{
return o->need_recalculate;
}
EOLIAN static void
-_evas_object_smart_smart_calculate(Eo *eo_obj, Evas_Smart_Data *o)
+_efl_canvas_group_group_calculate(Eo *eo_obj, Evas_Smart_Data *o)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -1004,7 +1004,7 @@ evas_call_smarts_calculate(Evas *eo_e)
if (obj->smart.smart && obj->smart.smart->smart_class->calculate)
obj->smart.smart->smart_class->calculate(obj->object);
else
- evas_obj_smart_calculate(obj->object);
+ efl_canvas_group_calculate(obj->object);
}
}
@@ -1022,12 +1022,12 @@ evas_call_smarts_calculate(Evas *eo_e)
}
EOLIAN static void
-_evas_object_smart_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
+_efl_canvas_group_group_change(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_async_block(obj);
evas_object_change(eo_obj, obj);
- evas_obj_smart_need_recalculate_set(eo_obj, 1);
+ efl_canvas_group_need_recalculate_set(eo_obj, 1);
}
Eina_Bool
@@ -1073,7 +1073,7 @@ evas_object_smart_del(Evas_Object *eo_obj)
if (s && s->smart_class->del)
s->smart_class->del(eo_obj);
else
- evas_obj_smart_del(eo_obj);
+ efl_canvas_group_del(eo_obj);
if (obj->smart.parent) evas_object_smart_member_del(eo_obj);
if (s)
@@ -1513,20 +1513,20 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
}
static void
-_evas_object_smart_class_constructor(Eo_Class *klass EINA_UNUSED)
+_efl_canvas_group_class_constructor(Eo_Class *klass EINA_UNUSED)
{
_evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL);
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
static void
-_evas_object_smart_class_destructor(Eo_Class *klass EINA_UNUSED)
+_efl_canvas_group_class_destructor(Eo_Class *klass EINA_UNUSED)
{
eina_hash_free(_evas_smart_class_names_hash_table);
}
static void
-_evas_object_smart_smart_paragraph_direction_set_internal(Eo *eo_obj,
+_efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj,
Evas_BiDi_Direction dir)
{
Evas_Object_Protected_Data *o;
@@ -1538,20 +1538,20 @@ _evas_object_smart_smart_paragraph_direction_set_internal(Eo *eo_obj,
if (o->is_smart)
{
- member_o = eo_data_scope_get(o->object, EVAS_OBJECT_SMART_CLASS);
+ member_o = eo_data_scope_get(o->object, EFL_CANVAS_GROUP_CLASS);
if ((member_o->inherit_paragraph_direction) &&
(member_o->paragraph_direction != dir))
{
member_o->paragraph_direction = dir;
- _evas_object_smart_smart_paragraph_direction_set_internal(o->object, dir);
+ _efl_canvas_group_group_paragraph_direction_set_internal(o->object, dir);
}
}
}
}
EOLIAN static void
-_evas_object_smart_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Data *o, Evas_BiDi_Direction dir)
+_efl_canvas_group_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Data *o, Evas_BiDi_Direction dir)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
Evas_Smart_Data *parent;
@@ -1567,7 +1567,7 @@ _evas_object_smart_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Da
if (obj->smart.parent)
{
- parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_SMART_CLASS);
+ parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_GROUP_CLASS);
if (parent)
parent_dir = parent->paragraph_direction;
@@ -1586,13 +1586,13 @@ _evas_object_smart_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Da
evas_object_change(eo_obj, obj);
}
- _evas_object_smart_smart_paragraph_direction_set_internal(eo_obj, o->paragraph_direction);
+ _efl_canvas_group_group_paragraph_direction_set_internal(eo_obj, o->paragraph_direction);
}
EOLIAN static Evas_BiDi_Direction
-_evas_object_smart_evas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
+_efl_canvas_group_evas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
{
return o->paragraph_direction;
}
-#include "canvas/evas_object_smart.eo.c"
+#include "canvas/efl_canvas_group.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo
deleted file mode 100644
index f09f5942e7..0000000000
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ /dev/null
@@ -1,204 +0,0 @@
-class Evas.Object.Smart (Evas.Object)
-{
- legacy_prefix: evas_object_smart;
- eo_prefix: evas_obj_smart;
- data: Evas_Smart_Data;
- methods {
- @property smart_need_recalculate {
- set {
- [[Set or unset the flag signalling that a given smart object needs to
- get recalculated.
-
- If this flag is set, then the $calculate() smart function of
- $obj will be called, if one is provided, during rendering phase of
- Evas (see evas_render()), after which this flag will be
- automatically unset.
-
- If that smart function is not provided for the given object, this
- flag will be left unchanged.
-
- Note: just setting this flag will not make the canvas' whole scene
- dirty, by itself, and evas_render() will have no effect. To
- force that, use evas_object_smart_changed(), that will also
- call this function automatically, with $true as parameter.
-
- See also @.smart_need_recalculate.get, @.smart_calculate and
- \@ref evas_smart_objects_calculate().]]
- legacy: evas_object_smart_need_recalculate_set;
- }
- get {
- [[Get the value of the flag signalling that a given smart object needs to
- get recalculated.
-
- Note: this flag will be unset during the rendering phase, when the
- $calculate() smart function is called, if one is provided.
- If it's not provided, then the flag will be left unchanged
- after the rendering phase.
-
- See also @.smart_need_recalculate.set, for more details.]]
- legacy: evas_object_smart_need_recalculate_get;
- }
- values {
- value: bool; [[whether one wants to set ($true) or to unset
- ($false) the flag.]]
- }
- }
- @property smart_clip {
- set {
- [[No description supplied by the EAPI.]]
- legacy: null;
- }
- values {
- clip: Evas.Object;
- }
- }
- @property smart_color {
- set {
- [[No description supplied by the EAPI.]]
- legacy: null;
- }
- values {
- r: int;
- g: int;
- b: int;
- a: int;
- }
- }
- smart_show {
- [[No description supplied by the EAPI.]]
- legacy: null;
- }
- smart_move {
- [[No description supplied by the EAPI.]]
- legacy: null;
- params {
- @in x: Evas.Coord;
- @in y: Evas.Coord;
- }
- }
- @property smart_no_render {
- [[Propagates the value of no-render to the smart children.]]
- set { legacy: null; }
- values { hide: bool; }
- }
- smart_iterator_new @const {
- [[Retrieves an iterator of the member objects of a given Evas smart object.
-
- See also @.smart_member_add and @.smart_member_del
-
- @since 1.8]]
- return: free(own(iterator<Evas.Object>), eina_iterator_free)
- @warn_unused; [[Returns the iterator of the member objects of $obj.]]
- legacy: evas_object_smart_iterator_new;
- }
- smart_hide {
- [[No description supplied by the EAPI.]]
- legacy: null;
- }
- smart_calculate {
- [[Call the calculate() smart function immediately on a given smart object.
-
- This will force immediate calculations (see #Evas_Smart_Class)
- needed for renderization of this object and, besides, unset the
- flag on it telling it needs recalculation for the next rendering
- phase.
-
- See also @.smart_need_recalculate.set]]
- legacy: evas_object_smart_calculate;
- }
- smart_add {
- [[Instantiates a new smart object described by $s.
-
- This is the function one should use when defining the public
- function adding an instance of the new smart object to a given
- canvas. It will take care of setting all of its internals to work
- as they should, if the user set things properly, as seem on the
- #EVAS_SMART_SUBCLASS_NEW, for example.]]
- legacy: null;
- }
- smart_member_add {
- [[Set an Evas object as a member of a given smart object.
-
- Members will automatically be stacked and layered together with the
- smart object. The various stacking functions will operate on
- members relative to the other members instead of the entire canvas,
- since they now live on an exclusive layer (see
- evas_object_stack_above(), for more details).
-
- Any $smart_obj object's specific implementation of the
- $member_add() smart function will take place too, naturally.
-
- See also @.smart_member_del.]]
-
- params {
- @in sub_obj: Evas.Object @nonull; [[The member object.]]
- }
- legacy: null;
- }
- smart_resize {
- [[No description supplied by the EAPI.]]
- legacy: null;
- params {
- @in w: Evas.Coord;
- @in h: Evas.Coord;
- }
- }
- smart_clip_unset {
- [[No description supplied by the EAPI.]]
- legacy: null;
- }
- smart_changed {
- [[Mark smart object as changed, dirty.
-
- This will flag the given object as needing recalculation,
- forcefully. As an effect, on the next rendering cycle its
- calculate() (see #Evas_Smart_Class) smart function will be called.
-
- See also @.smart_need_recalculate.set and @.smart_calculate.]]
- legacy: evas_object_smart_changed;
- }
- smart_member_del {
- [[Removes a member object from a given smart object.
-
- This removes a member object from a smart object, if it was added
- to any. The object will still be on the canvas, but no longer
- associated with whichever smart object it was associated with.
-
- See also @.smart_member_add for more details.]]
-
- params {
- @in sub_obj: Evas.Object; [[the member object.]]
- }
- legacy: null;
- }
- smart_del {
- [[Deletes a smart object.]]
- legacy: null;
- }
- smart_move_children_relative {
- [[Moves all children objects of a given smart object relative to a
- given offset.
-
- This will make each of $obj object's children to move, from where
- they before, with those delta values (offsets) on both directions.
-
- Note: This is most useful on custom smart $move functions.
-
- Note: Clipped smart objects already make use of this function on
- their $move smart function definition.
- ]]
- params {
- @in dx: Evas.Coord; [[Horizontal offset (delta).]]
- @in dy: Evas.Coord; [[Vertical offset (delta).]]
- }
- legacy: evas_object_smart_move_children_relative;
- }
- }
- implements {
- class.constructor;
- class.destructor;
- Eo.Base.constructor;
- Evas.Object.paragraph_direction.set;
- Evas.Object.paragraph_direction.get;
- }
-}
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 36806f6ee8..18ed6bbf7a 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -1,7 +1,7 @@
#include "evas_common_private.h"
#include "evas_private.h"
-#define MY_CLASS EFL_CANVAS_OBJECT_INTERNAL_SMART_CLIPPED_CLASS
+#define MY_CLASS EFL_CANVAS_GROUP_CLIPPED_CLASS
#define CSO_DATA_GET(eo_obj, ptr) \
Evas_Object_Smart_Clipped_Data *ptr = (eo_isa(eo_obj, MY_CLASS) ? \
@@ -13,7 +13,7 @@
if (!ptr) return;
EOLIAN void
-_evas_object_smart_smart_move_children_relative(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_Coord dx, Evas_Coord dy)
+_efl_canvas_group_group_children_move(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_Coord dx, Evas_Coord dy)
{
const Eina_Inlist *lst;
@@ -40,9 +40,9 @@ evas_object_smart_clipped_clipper_get(const Evas_Object *eo_obj)
{
Evas_Object_Smart_Clipped_Data *obj;
- if (!eo_isa(eo_obj, EFL_CANVAS_OBJECT_INTERNAL_SMART_CLIPPED_CLASS))
+ if (!eo_isa(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS))
return NULL;
- obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_INTERNAL_SMART_CLIPPED_CLASS);
+ obj = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
return obj->clipper;
}
@@ -72,7 +72,7 @@ evas_object_smart_clipped_smart_add(Evas_Object *eo_obj)
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
+_efl_canvas_group_clipped_efl_canvas_group_group_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_add(eo_obj);
}
@@ -89,7 +89,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
evas_object_del(clipper);
}
- _evas_object_smart_smart_members_all_del(eo_obj);
+ _efl_canvas_group_group_members_all_del(eo_obj);
/* If it's a legacy smart object, we should free the cso. */
if (!eo_isa(eo_obj, MY_CLASS))
@@ -99,7 +99,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
+_efl_canvas_group_clipped_efl_canvas_group_group_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_del(eo_obj);
}
@@ -114,13 +114,13 @@ evas_object_smart_clipped_smart_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coo
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y)
+_efl_canvas_group_clipped_efl_canvas_group_group_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y)
{
evas_object_smart_clipped_smart_move(eo_obj, x, y);
}
static void
-evas_object_smart_clipped_smart_show(Evas_Object *eo_obj)
+evas_object_smart_clipped_group_show(Evas_Object *eo_obj)
{
CSO_DATA_GET_OR_RETURN(eo_obj, cso);
if (evas_object_clipees_has(cso->clipper))
@@ -128,22 +128,22 @@ evas_object_smart_clipped_smart_show(Evas_Object *eo_obj)
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
+_efl_canvas_group_clipped_efl_canvas_group_group_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
- evas_object_smart_clipped_smart_show(eo_obj);
+ evas_object_smart_clipped_group_show(eo_obj);
}
static void
-evas_object_smart_clipped_smart_hide(Evas_Object *eo_obj)
+evas_object_smart_clipped_group_hide(Evas_Object *eo_obj)
{
CSO_DATA_GET_OR_RETURN(eo_obj, cso);
evas_object_hide(cso->clipper);
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
+_efl_canvas_group_clipped_efl_canvas_group_group_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
- evas_object_smart_clipped_smart_hide(eo_obj);
+ evas_object_smart_clipped_group_hide(eo_obj);
}
static void
@@ -154,7 +154,7 @@ evas_object_smart_clipped_smart_color_set(Evas_Object *eo_obj, int r, int g, int
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a)
+_efl_canvas_group_clipped_efl_canvas_group_group_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a)
{
evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a);
}
@@ -167,7 +167,7 @@ evas_object_smart_clipped_smart_clip_set(Evas_Object *eo_obj, Evas_Object *clip)
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip)
+_efl_canvas_group_clipped_efl_canvas_group_group_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip)
{
evas_object_smart_clipped_smart_clip_set(eo_obj, clip);
}
@@ -180,7 +180,7 @@ evas_object_smart_clipped_smart_clip_unset(Evas_Object *eo_obj)
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
+_efl_canvas_group_clipped_efl_canvas_group_group_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_clip_unset(eo_obj);
}
@@ -197,9 +197,9 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
+_efl_canvas_group_clipped_efl_canvas_group_group_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
{
- evas_obj_smart_member_add(eo_super(eo_obj, MY_CLASS), member);
+ efl_canvas_group_member_add(eo_super(eo_obj, MY_CLASS), member);
evas_object_smart_clipped_smart_member_add(eo_obj, member);
}
@@ -215,10 +215,10 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem
}
EOLIAN static void
-_efl_canvas_object_internal_smart_clipped_evas_object_smart_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
+_efl_canvas_group_clipped_efl_canvas_group_group_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
{
evas_object_smart_clipped_smart_member_del(eo_obj, member);
- evas_obj_smart_member_del(eo_super(eo_obj, MY_CLASS), member);
+ efl_canvas_group_member_del(eo_super(eo_obj, MY_CLASS), member);
}
EAPI void
@@ -230,8 +230,8 @@ evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc)
sc->add = evas_object_smart_clipped_smart_add;
sc->del = evas_object_smart_clipped_smart_del;
sc->move = evas_object_smart_clipped_smart_move;
- sc->show = evas_object_smart_clipped_smart_show;
- sc->hide = evas_object_smart_clipped_smart_hide;
+ sc->show = evas_object_smart_clipped_group_show;
+ sc->hide = evas_object_smart_clipped_group_hide;
sc->color_set = evas_object_smart_clipped_smart_color_set;
sc->clip_set = evas_object_smart_clipped_smart_clip_set;
sc->clip_unset = evas_object_smart_clipped_smart_clip_unset;
@@ -254,5 +254,5 @@ evas_object_smart_clipped_class_get(void)
return class;
}
-#include "canvas/efl_canvas_object_internal_smart_clipped.eo.c"
+#include "canvas/efl_canvas_group_clipped.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index cd616ffb84..c5fe22a354 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -884,7 +884,7 @@ _evas_object_table_smart_calculate_regular(Evas_Object *o, Evas_Table_Data *priv
}
EOLIAN static void
-_evas_table_evas_object_smart_smart_add(Eo *obj, Evas_Table_Data *priv)
+_evas_table_efl_canvas_group_group_add(Eo *obj, Evas_Table_Data *priv)
{
priv->pad.h = 0;
priv->pad.v = 0;
@@ -898,11 +898,11 @@ _evas_table_evas_object_smart_smart_add(Eo *obj, Evas_Table_Data *priv)
priv->expand_h = 0;
priv->expand_v = 0;
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_evas_table_evas_object_smart_smart_del(Eo *obj, Evas_Table_Data *priv)
+_evas_table_efl_canvas_group_group_del(Eo *obj, Evas_Table_Data *priv)
{
Eina_List *l;
@@ -922,11 +922,11 @@ _evas_table_evas_object_smart_smart_del(Eo *obj, Evas_Table_Data *priv)
priv->cache = NULL;
}
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
EOLIAN static void
-_evas_table_evas_object_smart_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
+_evas_table_efl_canvas_group_group_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
{
Evas_Coord ow, oh;
evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
@@ -935,7 +935,7 @@ _evas_table_evas_object_smart_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UN
}
EOLIAN static void
-_evas_table_evas_object_smart_smart_calculate(Eo *o, Evas_Table_Data *priv)
+_evas_table_efl_canvas_group_group_calculate(Eo *o, Evas_Table_Data *priv)
{
Evas *e;
@@ -1402,7 +1402,7 @@ _evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored)
if (priv->is_mirrored != mirrored)
{
priv->is_mirrored = mirrored;
- evas_obj_smart_calculate(o);
+ efl_canvas_group_calculate(o);
}
}
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 3809b53b8a..138c87de41 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1079,7 +1079,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj)
(current->cur->visible) &&
(!current->delete_me) &&
(current->cur->cache.clip.visible) &&
- (!eo_isa(eo_current, EVAS_OBJECT_SMART_CLASS)))
+ (!eo_isa(eo_current, EFL_CANVAS_GROUP_CLASS)))
{
Eina_Bool included = EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 36c88ee1aa..d1de46c8d8 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -9,7 +9,7 @@ enum Evas.Object_Table.Homogeneous_Mode {
item = 2
}
-class Evas.Table (Efl.Canvas.Object.Internal.Smart.Clipped)
+class Evas.Table (Efl.Canvas.Group.Clipped)
{
legacy_prefix: evas_object_table;
eo_prefix: evas_obj_table;
@@ -216,9 +216,9 @@ class Evas.Table (Efl.Canvas.Object.Internal.Smart.Clipped)
implements {
class.constructor;
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_resize;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_calculate;
+ Efl.Canvas.Group.group_resize;
}
}
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 4f40f6ea85..e6b84a5450 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1583,7 +1583,7 @@ void evas_object_smart_member_lower(Evas_Object *member);
void evas_object_smart_member_stack_above(Evas_Object *member, Evas_Object *other);
void evas_object_smart_member_stack_below(Evas_Object *member, Evas_Object *other);
const Eina_Inlist *evas_object_smart_members_get_direct(const Evas_Object *obj);
-void _evas_object_smart_smart_members_all_del(Evas_Object *obj);
+void _efl_canvas_group_group_members_all_del(Evas_Object *obj);
void evas_call_smarts_calculate(Evas *e);
void evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj);
void evas_object_smart_need_bounding_box_update(Evas_Object *eo_obj, Evas_Smart_Data *o, Evas_Object_Protected_Data *obj);
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index 292d8bc1a1..c2c3bd3e45 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -44,7 +44,7 @@ _elm_web_none_elm_web_tab_propagate_set(Eo *obj EINA_UNUSED, Elm_Web_None_Data *
}
EOLIAN static void
-_elm_web_none_evas_object_smart_smart_add(Eo *obj, Elm_Web_None_Data *_pd EINA_UNUSED)
+_elm_web_none_efl_canvas_group_group_add(Eo *obj, Elm_Web_None_Data *_pd EINA_UNUSED)
{
Evas_Object *resize_obj;
@@ -52,7 +52,7 @@ _elm_web_none_evas_object_smart_smart_add(Eo *obj, Elm_Web_None_Data *_pd EINA_U
elm_object_text_set(resize_obj, "WebKit not supported!");
elm_widget_resize_object_set(obj, resize_obj, EINA_TRUE);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
}
diff --git a/src/modules/elementary/web/none/elm_web_none.eo b/src/modules/elementary/web/none/elm_web_none.eo
index 9b4ee2a870..65d29aa1b2 100644
--- a/src/modules/elementary/web/none/elm_web_none.eo
+++ b/src/modules/elementary/web/none/elm_web_none.eo
@@ -1,7 +1,7 @@
class Elm.Web.None (Elm.Web)
{
implements {
- Evas.Object.Smart.smart_add;
+ Efl.Canvas.Group.group_add;
Elm.Web.tab_propagate.get;
Elm.Web.tab_propagate.set;
Elm.Web.webkit_view.get;