aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/emotion
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/emotion_object.eo20
-rw-r--r--src/lib/emotion/emotion_smart.c18
2 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/emotion/emotion_object.eo b/src/lib/emotion/emotion_object.eo
index 8ebdbedd89..5b9f2894e4 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -1,4 +1,4 @@
-class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) {
+class Emotion.Object (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) {
legacy_prefix: emotion_object;
eo_prefix: emotion_obj;
event_prefix: emotion_object;
@@ -54,15 +54,15 @@ class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Im
}
implements {
Eo.Base.constructor;
- Evas.Object.Smart.smart_add;
- Evas.Object.Smart.smart_del;
- Evas.Object.Smart.smart_move;
- Evas.Object.Smart.smart_resize;
- Evas.Object.Smart.smart_show;
- Evas.Object.Smart.smart_hide;
- Evas.Object.Smart.smart_color.set;
- Evas.Object.Smart.smart_clip.set;
- Evas.Object.Smart.smart_clip_unset;
+ Efl.Canvas.Group.group_add;
+ Efl.Canvas.Group.group_del;
+ Efl.Canvas.Group.group_move;
+ Efl.Canvas.Group.group_resize;
+ Efl.Canvas.Group.group_show;
+ Efl.Canvas.Group.group_hide;
+ Efl.Canvas.Group.group_color.set;
+ Efl.Canvas.Group.group_clip.set;
+ Efl.Canvas.Group.group_clip_unset;
Efl.File.file.set;
Efl.File.file.get;
Efl.Player.play.set;
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 3df5b60846..1b3364ca07 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -1829,7 +1829,7 @@ _pixels_get(void *data, Evas_Object *obj)
/*******************************************/
EOLIAN static void
-_emotion_object_evas_object_smart_smart_add(Evas_Object *obj, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_add(Evas_Object *obj, Emotion_Object_Data *sd)
{
unsigned int *pixel;
@@ -1864,7 +1864,7 @@ _emotion_object_evas_object_smart_smart_add(Evas_Object *obj, Emotion_Object_Dat
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
if (!sd) return;
if (sd->engine_instance)
@@ -1895,7 +1895,7 @@ _emotion_object_evas_object_smart_smart_del(Evas_Object *obj EINA_UNUSED, Emotio
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y)
+_emotion_object_efl_canvas_group_group_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y)
{
int w, h;
@@ -1905,14 +1905,14 @@ _emotion_object_evas_object_smart_smart_move(Evas_Object *obj, Emotion_Object_Da
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h)
+_emotion_object_efl_canvas_group_group_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h)
{
_emotion_object_aspect_border_apply(obj, sd, w, h);
evas_object_resize(sd->bg, w, h);
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
int a;
@@ -1924,7 +1924,7 @@ _emotion_object_evas_object_smart_smart_show(Evas_Object *obj EINA_UNUSED, Emoti
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
evas_object_hide(sd->obj);
if (sd->crop.clipper) evas_object_hide(sd->crop.clipper);
@@ -1932,14 +1932,14 @@ _emotion_object_evas_object_smart_smart_hide(Evas_Object *obj EINA_UNUSED, Emoti
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_color_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, int r, int g, int b, int a)
+_emotion_object_efl_canvas_group_group_color_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, int r, int g, int b, int a)
{
evas_object_color_set(sd->obj, r, g, b, a);
evas_object_color_set(sd->crop.clipper, r, g, b, a);
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip)
+_emotion_object_efl_canvas_group_group_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip)
{
if (sd->crop.clipper) evas_object_clip_set(sd->crop.clipper, clip);
else evas_object_clip_set(sd->obj, clip);
@@ -1947,7 +1947,7 @@ _emotion_object_evas_object_smart_smart_clip_set(Evas_Object *obj EINA_UNUSED, E
}
EOLIAN static void
-_emotion_object_evas_object_smart_smart_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_efl_canvas_group_group_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
if (sd->crop.clipper) evas_object_clip_unset(sd->crop.clipper);
else evas_object_clip_unset(sd->obj);