summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 17:26:08 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 19:32:43 +0900
commit52f9220b3fceb6f20b22fba30a9a69ae5e448f5a (patch)
tree68b6d762d87f9f8eaa9ff8832aa028998a2d6651 /src/lib/emotion
parentc8ee5583a961ff3d0f40c048548fe204b571cdef (diff)
Evas: Rename smart object into Efl.Canvas.Group
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 @@
1class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) { 1class Emotion.Object (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) {
2 legacy_prefix: emotion_object; 2 legacy_prefix: emotion_object;
3 eo_prefix: emotion_obj; 3 eo_prefix: emotion_obj;
4 event_prefix: emotion_object; 4 event_prefix: emotion_object;
@@ -54,15 +54,15 @@ class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Im
54 } 54 }
55 implements { 55 implements {
56 Eo.Base.constructor; 56 Eo.Base.constructor;
57 Evas.Object.Smart.smart_add; 57 Efl.Canvas.Group.group_add;
58 Evas.Object.Smart.smart_del; 58 Efl.Canvas.Group.group_del;
59 Evas.Object.Smart.smart_move; 59 Efl.Canvas.Group.group_move;
60 Evas.Object.Smart.smart_resize; 60 Efl.Canvas.Group.group_resize;
61 Evas.Object.Smart.smart_show; 61 Efl.Canvas.Group.group_show;
62 Evas.Object.Smart.smart_hide; 62 Efl.Canvas.Group.group_hide;
63 Evas.Object.Smart.smart_color.set; 63 Efl.Canvas.Group.group_color.set;
64 Evas.Object.Smart.smart_clip.set; 64 Efl.Canvas.Group.group_clip.set;
65 Evas.Object.Smart.smart_clip_unset; 65 Efl.Canvas.Group.group_clip_unset;
66 Efl.File.file.set; 66 Efl.File.file.set;
67 Efl.File.file.get; 67 Efl.File.file.get;
68 Efl.Player.play.set; 68 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)
1829/*******************************************/ 1829/*******************************************/
1830 1830
1831EOLIAN static void 1831EOLIAN static void
1832_emotion_object_evas_object_smart_smart_add(Evas_Object *obj, Emotion_Object_Data *sd) 1832_emotion_object_efl_canvas_group_group_add(Evas_Object *obj, Emotion_Object_Data *sd)
1833{ 1833{
1834 unsigned int *pixel; 1834 unsigned int *pixel;
1835 1835
@@ -1864,7 +1864,7 @@ _emotion_object_evas_object_smart_smart_add(Evas_Object *obj, Emotion_Object_Dat
1864} 1864}
1865 1865
1866EOLIAN static void 1866EOLIAN static void
1867_emotion_object_evas_object_smart_smart_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd) 1867_emotion_object_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
1868{ 1868{
1869 if (!sd) return; 1869 if (!sd) return;
1870 if (sd->engine_instance) 1870 if (sd->engine_instance)
@@ -1895,7 +1895,7 @@ _emotion_object_evas_object_smart_smart_del(Evas_Object *obj EINA_UNUSED, Emotio
1895} 1895}
1896 1896
1897EOLIAN static void 1897EOLIAN static void
1898_emotion_object_evas_object_smart_smart_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y) 1898_emotion_object_efl_canvas_group_group_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y)
1899{ 1899{
1900 int w, h; 1900 int w, h;
1901 1901
@@ -1905,14 +1905,14 @@ _emotion_object_evas_object_smart_smart_move(Evas_Object *obj, Emotion_Object_Da
1905} 1905}
1906 1906
1907EOLIAN static void 1907EOLIAN static void
1908_emotion_object_evas_object_smart_smart_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h) 1908_emotion_object_efl_canvas_group_group_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h)
1909{ 1909{
1910 _emotion_object_aspect_border_apply(obj, sd, w, h); 1910 _emotion_object_aspect_border_apply(obj, sd, w, h);
1911 evas_object_resize(sd->bg, w, h); 1911 evas_object_resize(sd->bg, w, h);
1912} 1912}
1913 1913
1914EOLIAN static void 1914EOLIAN static void
1915_emotion_object_evas_object_smart_smart_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd) 1915_emotion_object_efl_canvas_group_group_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
1916{ 1916{
1917 int a; 1917 int a;
1918 1918
@@ -1924,7 +1924,7 @@ _emotion_object_evas_object_smart_smart_show(Evas_Object *obj EINA_UNUSED, Emoti
1924} 1924}
1925 1925
1926EOLIAN static void 1926EOLIAN static void
1927_emotion_object_evas_object_smart_smart_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd) 1927_emotion_object_efl_canvas_group_group_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
1928{ 1928{
1929 evas_object_hide(sd->obj); 1929 evas_object_hide(sd->obj);
1930 if (sd->crop.clipper) evas_object_hide(sd->crop.clipper); 1930 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
1932} 1932}
1933 1933
1934EOLIAN static void 1934EOLIAN static void
1935_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) 1935_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)
1936{ 1936{
1937 evas_object_color_set(sd->obj, r, g, b, a); 1937 evas_object_color_set(sd->obj, r, g, b, a);
1938 evas_object_color_set(sd->crop.clipper, r, g, b, a); 1938 evas_object_color_set(sd->crop.clipper, r, g, b, a);
1939} 1939}
1940 1940
1941EOLIAN static void 1941EOLIAN static void
1942_emotion_object_evas_object_smart_smart_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip) 1942_emotion_object_efl_canvas_group_group_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip)
1943{ 1943{
1944 if (sd->crop.clipper) evas_object_clip_set(sd->crop.clipper, clip); 1944 if (sd->crop.clipper) evas_object_clip_set(sd->crop.clipper, clip);
1945 else evas_object_clip_set(sd->obj, clip); 1945 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
1947} 1947}
1948 1948
1949EOLIAN static void 1949EOLIAN static void
1950_emotion_object_evas_object_smart_smart_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd) 1950_emotion_object_efl_canvas_group_group_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
1951{ 1951{
1952 if (sd->crop.clipper) evas_object_clip_unset(sd->crop.clipper); 1952 if (sd->crop.clipper) evas_object_clip_unset(sd->crop.clipper);
1953 else evas_object_clip_unset(sd->obj); 1953 else evas_object_clip_unset(sd->obj);