aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_calc.c12
-rw-r--r--src/lib/edje/edje_edit.c4
-rw-r--r--src/lib/edje/edje_edit.eo2
-rw-r--r--src/lib/edje/edje_object.eo18
-rw-r--r--src/lib/edje/edje_smart.c30
5 files changed, 33 insertions, 33 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index ad1d3c27ea..436825512e 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2939,8 +2939,8 @@ _edje_part_recalc_single(Edje *ed,
{
Evas_Coord lminw = 0, lminh = 0;
- evas_obj_smart_need_recalculate_set(ep->object, 1);
- evas_obj_smart_calculate(ep->object);
+ efl_canvas_group_need_recalculate_set(ep->object, 1);
+ efl_canvas_group_calculate(ep->object);
efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh);
if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h)
{
@@ -2957,8 +2957,8 @@ _edje_part_recalc_single(Edje *ed,
{
Evas_Coord lminw = 0, lminh = 0;
- evas_obj_smart_need_recalculate_set(ep->object, 1);
- evas_obj_smart_calculate(ep->object);
+ efl_canvas_group_need_recalculate_set(ep->object, 1);
+ efl_canvas_group_calculate(ep->object);
efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh);
if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h)
{
@@ -3124,8 +3124,8 @@ _edje_table_recalc_apply(Edje *ed EINA_UNUSED,
evas_obj_table_padding_set(ep->object, chosen_desc->table.padding.x, chosen_desc->table.padding.y);
if (evas_object_smart_need_recalculate_get(ep->object))
{
- evas_obj_smart_need_recalculate_set(ep->object, 0);
- evas_obj_smart_calculate(ep->object);
+ efl_canvas_group_need_recalculate_set(ep->object, 0);
+ efl_canvas_group_calculate(ep->object);
}
}
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 7141853fd6..ded6c81e1b 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -148,11 +148,11 @@ _edje_edit_data_clean(Edje_Edit *eed)
}
EOLIAN static void
-_edje_edit_evas_object_smart_smart_del(Eo *obj, Edje_Edit *eed)
+_edje_edit_efl_canvas_group_group_del(Eo *obj, Edje_Edit *eed)
{
_edje_edit_data_clean(eed);
- evas_obj_smart_del(eo_super(obj, MY_CLASS));
+ efl_canvas_group_del(eo_super(obj, MY_CLASS));
}
static void
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index e11c9219b1..aa0e8e6cb3 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -10,7 +10,7 @@ class Edje.Edit (Edje.Object)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Evas.Object.Smart.smart_del;
+ Efl.Canvas.Group.group_del;
Efl.File.file.set;
}
}
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 012bf33903..0449e4f9c1 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1,6 +1,6 @@
import edje_types;
-class Edje.Object (Efl.Canvas.Object.Internal.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
+class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
{
legacy_prefix: edje_object;
eo_prefix: edje_obj;
@@ -1991,14 +1991,14 @@ class Edje.Object (Efl.Canvas.Object.Internal.Smart.Clipped, Efl.File, Efl.Conta
Eo.Base.destructor;
Eo.Base.dbg_info_get;
Evas.Object.paragraph_direction.set;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_calculate;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_no_render.set;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_no_render.set;
+ Efl.Canvas.Group.group_calculate;
Efl.File.file.set;
Efl.File.file.get;
Efl.File.mmap.set;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index c9bb86373b..72b9dd078e 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -31,7 +31,7 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
Evas *e;
void *tmp;
- ed->base = eo_data_ref(obj, EFL_CANVAS_OBJECT_INTERNAL_SMART_CLIPPED_CLASS);
+ ed->base = eo_data_ref(obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
ed->duration_scale = 1.0;
obj = eo_constructor(eo_super(obj, MY_CLASS));
@@ -109,13 +109,13 @@ _edje_size_class_free(void *data)
/* Private Routines */
EOLIAN static void
-_edje_object_evas_object_smart_smart_add(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_add(Eo *obj, Edje *ed)
{
Evas *tev = evas_object_evas_get(obj);
evas_event_freeze(tev);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(eo_super(obj, MY_CLASS));
ed->is_rtl = EINA_FALSE;
ed->have_objects = EINA_TRUE;
@@ -147,7 +147,7 @@ _edje_object_evas_object_smart_smart_add(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_del(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_del(Eo *obj, Edje *ed)
{
_edje_block_violate(ed);
ed->delete_me = 1;
@@ -170,7 +170,7 @@ _edje_object_evas_object_smart_smart_del(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
+_edje_object_efl_canvas_group_group_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
{
unsigned int i;
@@ -260,7 +260,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h)
+_edje_object_efl_canvas_group_group_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h)
{
if ((w == ed->w) && (h == ed->h)) return;
if (ed->collection)
@@ -291,12 +291,12 @@ _edje_object_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_show(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_show(Eo *obj, Edje *ed)
{
Eina_List *l;
Edje *edg;
- evas_obj_smart_show(eo_super(obj, MY_CLASS));
+ efl_canvas_group_show(eo_super(obj, MY_CLASS));
if (evas_object_visible_get(obj)) return;
if (_edje_lua_script_only(ed))
{
@@ -319,12 +319,12 @@ _edje_object_evas_object_smart_smart_show(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_hide(Eo *obj, Edje *ed)
+_edje_object_efl_canvas_group_group_hide(Eo *obj, Edje *ed)
{
Eina_List *l;
Edje *edg;
- evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(eo_super(obj, MY_CLASS));
if (!evas_object_visible_get(obj)) return;
if (_edje_lua_script_only(ed))
{
@@ -337,20 +337,20 @@ _edje_object_evas_object_smart_smart_hide(Eo *obj, Edje *ed)
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_no_render_set(Eo *obj, Edje *ed, Eina_Bool hide)
+_edje_object_efl_canvas_group_group_no_render_set(Eo *obj, Edje *ed, Eina_Bool hide)
{
Eina_List *l;
Edje *edg;
- evas_obj_smart_no_render_set(eo_super(obj, MY_CLASS), hide);
+ efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide);
if (evas_obj_no_render_get(obj) == hide) return;
EINA_LIST_FOREACH(ed->groups, l, edg)
- if (edg != ed) evas_obj_smart_no_render_set(edg->obj, hide);
+ if (edg != ed) efl_canvas_group_no_render_set(edg->obj, hide);
}
EOLIAN static void
-_edje_object_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed)
+_edje_object_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Edje *ed)
{
_edje_recalc_do(ed);
}
@@ -474,7 +474,7 @@ _edje_object_evas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Di
/* Make it dirty to recalculate edje.
It needs to move text objects according to new paragraph direction */
ed->dirty = EINA_TRUE;
- evas_obj_smart_need_recalculate_set(obj, 1);
+ efl_canvas_group_need_recalculate_set(obj, 1);
}
#include "edje_object.eo.c"