enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas: Rename smart object into Efl.Canvas.Group

This commit is contained in:
Jean-Philippe Andre 2016-06-17 17:26:08 +09:00
parent c8ee5583a9
commit 52f9220b3f
177 changed files with 1180 additions and 1090 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile_Evas.am
View File

@ -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 \

12
src/lib/edje/edje_calc.c
View File

@ -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);
}
}

4
src/lib/edje/edje_edit.c
View File

@ -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

2
src/lib/edje/edje_edit.eo
View File

@ -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;
}
}

18
src/lib/edje/edje_object.eo
View File

@ -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;

30
src/lib/edje/edje_smart.c
View File

@ -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"

10
src/lib/elementary/efl_ui_box.c
View File

@ -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 *

6
src/lib/elementary/efl_ui_box.eo
View File

@ -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;

8
src/lib/elementary/efl_ui_flip.c
View File

@ -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 *

4
src/lib/elementary/efl_ui_flip.eo
View File

@ -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;

14
src/lib/elementary/efl_ui_grid.c
View File

@ -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 *

6
src/lib/elementary/efl_ui_grid.eo
View File

@ -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;

42
src/lib/elementary/efl_ui_image.c
View File

@ -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);

20
src/lib/elementary/efl_ui_image.eo
View File

@ -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;

8
src/lib/elementary/efl_ui_nstate.c
View File

@ -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

4
src/lib/elementary/efl_ui_nstate.eo
View File

@ -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;
}

28
src/lib/elementary/efl_ui_text.c
View File

@ -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);

14
src/lib/elementary/efl_ui_text.eo
View File

@ -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;

24
src/lib/elementary/efl_ui_win.c
View File

@ -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);

12
src/lib/elementary/efl_ui_win.eo
View File

@ -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;

20
src/lib/elementary/elc_combobox.c
View File

@ -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"

8
src/lib/elementary/elc_ctxpopup.c
View File

@ -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

8
src/lib/elementary/elc_fileselector.c
View File

@ -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;

8
src/lib/elementary/elc_fileselector_button.c
View File

@ -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

8
src/lib/elementary/elc_fileselector_entry.c
View File

@ -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 *

16
src/lib/elementary/elc_hoversel.c
View File

@ -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);
}

8
src/lib/elementary/elc_multibuttonentry.c
View File

@ -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;

10
src/lib/elementary/elc_naviframe.c
View File

@ -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;

8
src/lib/elementary/elc_player.c
View File

@ -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 *

8
src/lib/elementary/elc_popup.c
View File

@ -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));

4
src/lib/elementary/elm_access.c
View File

@ -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);
}

2
src/lib/elementary/elm_access.eo
View File

@ -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;
}

4
src/lib/elementary/elm_actionslider.c
View File

@ -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;

2
src/lib/elementary/elm_actionslider.eo
View File

@ -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;

4
src/lib/elementary/elm_bg.c
View File

@ -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);

2
src/lib/elementary/elm_bg.eo
View File

@ -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;

10
src/lib/elementary/elm_box.c
View File

@ -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 *

6
src/lib/elementary/elm_box.eo
View File

@ -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;

4
src/lib/elementary/elm_bubble.c
View File

@ -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

2
src/lib/elementary/elm_bubble.eo
View File

@ -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;

4
src/lib/elementary/elm_button.c
View File

@ -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

2
src/lib/elementary/elm_button.eo
View File

@ -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;

10
src/lib/elementary/elm_calendar.c
View File

@ -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;

6
src/lib/elementary/elm_calendar.eo
View File

@ -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;

4
src/lib/elementary/elm_check.c
View File

@ -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)))

2
src/lib/elementary/elm_check.eo
View File

@ -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;

8
src/lib/elementary/elm_clock.c
View File

@ -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;

4
src/lib/elementary/elm_clock.eo
View File

@ -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;

4
src/lib/elementary/elm_code_widget.c
View File

@ -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");

2
src/lib/elementary/elm_code_widget.eo
View File

@ -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;

8
src/lib/elementary/elm_colorselector.c
View File

@ -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]);
}

4
src/lib/elementary/elm_colorselector.eo
View File

@ -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;

10
src/lib/elementary/elm_combobox.eo
View File

@ -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;

8
src/lib/elementary/elm_conform.c
View File

@ -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

4
src/lib/elementary/elm_conformant.eo
View File

@ -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;

4
src/lib/elementary/elm_ctxpopup.eo
View File

@ -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;

8
src/lib/elementary/elm_datetime.c
View File

@ -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 *

4
src/lib/elementary/elm_datetime.eo
View File

@ -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;

8
src/lib/elementary/elm_dayselector.c
View File

@ -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 *

4
src/lib/elementary/elm_dayselector.eo
View File

@ -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;

20
src/lib/elementary/elm_diskselector.c
View File

@ -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);

10
src/lib/elementary/elm_diskselector.eo
View File

@ -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;

28
src/lib/elementary/elm_entry.c
View File

@ -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);

14
src/lib/elementary/elm_entry.eo
View File

@ -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;

4
src/lib/elementary/elm_fileselector.eo
View File

@ -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;

4
src/lib/elementary/elm_fileselector_button.eo
View File

@ -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;

4
src/lib/elementary/elm_fileselector_entry.eo
View File

@ -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;

8
src/lib/elementary/elm_flipselector.c
View File

@ -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 *

4
src/lib/elementary/elm_flipselector.eo
View File

@ -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;

6
src/lib/elementary/elm_frame.c
View File

@ -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

4
src/lib/elementary/elm_frame.eo
View File

@ -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;

26
src/lib/elementary/elm_gengrid.c
View File

@ -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);

10
src/lib/elementary/elm_gengrid.eo
View File

@ -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;

6
src/lib/elementary/elm_gengrid_pan.eo
View File

@ -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;

30
src/lib/elementary/elm_genlist.c
View File

@ -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);

10
src/lib/elementary/elm_genlist.eo
View File

@ -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;

8
src/lib/elementary/elm_genlist_pan.eo
View File

@ -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;

8
src/lib/elementary/elm_gesture_layer.c
View File

@ -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 *

4
src/lib/elementary/elm_gesture_layer.eo
View File

@ -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;
}

12
src/lib/elementary/elm_glview.c
View File

@ -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

6
src/lib/elementary/elm_glview.eo
View File

@ -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;

8
src/lib/elementary/elm_grid.c
View File

@ -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 *

4
src/lib/elementary/elm_grid.eo
View File

@ -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;

24
src/lib/elementary/elm_hover.c
View File

@ -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");

12
src/lib/elementary/elm_hover.eo
View File

@ -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;

8
src/lib/elementary/elm_hoversel.eo
View File

@ -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;

8
src/lib/elementary/elm_icon.c
View File

@ -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 */

4
src/lib/elementary/elm_icon.eo
View File

@ -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;
}

8
src/lib/elementary/elm_index.c
View File

@ -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;

4
src/lib/elementary/elm_index.eo
View File

@ -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;

28
src/lib/elementary/elm_interface_scrollable.c
View File

@ -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);

6
src/lib/elementary/elm_interface_scrollable.eo
View File

@ -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;

4
src/lib/elementary/elm_inwin.c
View File

@ -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);

2
src/lib/elementary/elm_inwin.eo
View File

@ -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;

4
src/lib/elementary/elm_label.c
View File

@ -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);

2
src/lib/elementary/elm_label.eo
View File

@ -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;

10
src/lib/elementary/elm_layout.c
View File

@ -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)
{

6
src/lib/elementary/elm_layout.eo
View File

@ -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;

20
src/lib/elementary/elm_list.c
View File

@ -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);

10
src/lib/elementary/elm_list.eo
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More