summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-10-10 16:44:48 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-10-12 11:25:56 +0900
commit62abe2cbff0aa809a474f7a89452256f5371ebc3 (patch)
tree53cfa5e16676b4c7987d3267d4cabcee817ea757 /src/lib/emotion
parentc60cc50f5a0cf76a287380eb89df117efc71cca8 (diff)
evas: Move clip_unset to legacy, remove group_clip
Similarly to group_color_set, group_clip_[un]set should not exist and should be a result of efl_super and inheritance. This patch also removes clip_unset from the EO API and keeps only clip_set(NULL). The reason is that it will avoid bad overrides of clip_unset() vs. clip_unset(NULL). This also simplifies the code a bit. Ideally we should be able to reintroduce clip_unset in EO if we can have a "@final" tag (like java's final keyword), to prevent overrides.
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/efl_canvas_video.eo3
-rw-r--r--src/lib/emotion/emotion_smart.c14
2 files changed, 5 insertions, 12 deletions
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 64b920c1d0..0e554adb79 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -52,14 +52,13 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
52 implements { 52 implements {
53 Efl.Object.constructor; 53 Efl.Object.constructor;
54 Efl.Gfx.color.set; 54 Efl.Gfx.color.set;
55 Efl.Canvas.Object.clip.set;
55 Efl.Canvas.Group.group_add; 56 Efl.Canvas.Group.group_add;
56 Efl.Canvas.Group.group_del; 57 Efl.Canvas.Group.group_del;
57 Efl.Canvas.Group.group_move; 58 Efl.Canvas.Group.group_move;
58 Efl.Canvas.Group.group_resize; 59 Efl.Canvas.Group.group_resize;
59 Efl.Canvas.Group.group_show; 60 Efl.Canvas.Group.group_show;
60 Efl.Canvas.Group.group_hide; 61 Efl.Canvas.Group.group_hide;
61 Efl.Canvas.Group.group_clip.set;
62 Efl.Canvas.Group.group_clip_unset;
63 Efl.File.file.set; 62 Efl.File.file.set;
64 Efl.File.file.get; 63 Efl.File.file.get;
65 Efl.Player.play.set; 64 Efl.Player.play.set;
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 3a9ebdeec0..36228ca143 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -1977,20 +1977,14 @@ _efl_canvas_video_efl_gfx_color_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd,
1977} 1977}
1978 1978
1979EOLIAN static void 1979EOLIAN static void
1980_efl_canvas_video_efl_canvas_group_group_clip_set(Evas_Object *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Evas_Object * clip) 1980_efl_canvas_video_efl_canvas_object_clip_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Evas_Object *clip)
1981{ 1981{
1982 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 0, clip))
1983 return;
1984
1982 if (sd->crop.clipper) evas_object_clip_set(sd->crop.clipper, clip); 1985 if (sd->crop.clipper) evas_object_clip_set(sd->crop.clipper, clip);
1983 else evas_object_clip_set(sd->obj, clip); 1986 else evas_object_clip_set(sd->obj, clip);
1984 evas_object_clip_set(sd->bg, clip); 1987 evas_object_clip_set(sd->bg, clip);
1985} 1988}
1986 1989
1987EOLIAN static void
1988_efl_canvas_video_efl_canvas_group_group_clip_unset(Evas_Object *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
1989{
1990 if (sd->crop.clipper) evas_object_clip_unset(sd->crop.clipper);
1991 else evas_object_clip_unset(sd->obj);
1992 evas_object_clip_unset(sd->bg);
1993
1994}
1995
1996#include "efl_canvas_video.eo.c" 1990#include "efl_canvas_video.eo.c"