summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-05 10:47:26 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:32 -0700
commit55bd097a3d5c0201c28bc0bd045cbe77aa76f5af (patch)
tree6929ab1b8bddee873305e58aed933d7039488fcf /src/lib/emotion
parent7934d152dd5c185df1b89f50239d27f25c6f2b88 (diff)
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/efl_canvas_video.eo4
-rw-r--r--src/lib/emotion/emotion_smart.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 859b02c..5513a6a 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -53,8 +53,8 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
53 } 53 }
54 implements { 54 implements {
55 Efl.Object.constructor; 55 Efl.Object.constructor;
56 Efl.Gfx.position { set; } 56 Efl.Gfx.Entity.position { set; }
57 Efl.Gfx.size { set; } 57 Efl.Gfx.Entity.size { set; }
58 Efl.File.file { get; set; } 58 Efl.File.file { get; set; }
59 Efl.Player.play { get; set; } 59 Efl.Player.play { get; set; }
60 Efl.Player.pos { get; set; } 60 Efl.Player.pos { get; set; }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 3985103..bc043ec 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -1937,26 +1937,26 @@ _efl_canvas_video_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Efl_C
1937} 1937}
1938 1938
1939EOLIAN static void 1939EOLIAN static void
1940_efl_canvas_video_efl_gfx_position_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Position2D pos) 1940_efl_canvas_video_efl_gfx_entity_position_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Position2D pos)
1941{ 1941{
1942 Eina_Size2D sz; 1942 Eina_Size2D sz;
1943 1943
1944 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 1944 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
1945 return; 1945 return;
1946 1946
1947 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 1947 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
1948 1948
1949 sz = efl_gfx_size_get(obj); 1949 sz = efl_gfx_entity_size_get(obj);
1950 _clipper_position_size_update(obj, pos.x, pos.y, sz.w, sz.h, sd->video.w, sd->video.h); 1950 _clipper_position_size_update(obj, pos.x, pos.y, sz.w, sz.h, sd->video.w, sd->video.h);
1951} 1951}
1952 1952
1953EOLIAN static void 1953EOLIAN static void
1954_efl_canvas_video_efl_gfx_size_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Size2D sz) 1954_efl_canvas_video_efl_gfx_entity_size_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Size2D sz)
1955{ 1955{
1956 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 1956 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
1957 return; 1957 return;
1958 1958
1959 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 1959 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
1960 1960
1961 _efl_canvas_video_aspect_border_apply(obj, sd, sz.w, sz.h); 1961 _efl_canvas_video_aspect_border_apply(obj, sd, sz.w, sz.h);
1962 evas_object_resize(sd->bg, sz.w, sz.h); 1962 evas_object_resize(sd->bg, sz.w, sz.h);