summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-06 11:56:50 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 09:57:05 +0900
commit9ed6838f17e43621eea6f388eb2f5eceba14ecad (patch)
treef32f2d1726cd03cf8b150f6e9a5caf266bd27122
parent8572cd5def291aa14c79bb21ea578d024eb36999 (diff)
evas: Remove class Efl.Canvas.Group.Clipped
The functionality is now merged inside the core Group class, which will allow us to clean up its API.
-rw-r--r--src/Makefile_Evas.am1
-rw-r--r--src/lib/evas/Evas_Eo.h6
-rw-r--r--src/lib/evas/canvas/efl_canvas_group_clipped.eo10
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c12
4 files changed, 0 insertions, 29 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index f743d43..9b141d1 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -36,7 +36,6 @@ evas_eolian_pub_files = \
36 lib/evas/canvas/efl_canvas_surface_x11.eo \ 36 lib/evas/canvas/efl_canvas_surface_x11.eo \
37 lib/evas/canvas/efl_canvas_surface_wayland.eo \ 37 lib/evas/canvas/efl_canvas_surface_wayland.eo \
38 lib/evas/canvas/efl_canvas_filter_internal.eo \ 38 lib/evas/canvas/efl_canvas_filter_internal.eo \
39 lib/evas/canvas/efl_canvas_group_clipped.eo \
40 lib/evas/canvas/efl_input_state.eo \ 39 lib/evas/canvas/efl_input_state.eo \
41 lib/evas/canvas/efl_input_interface.eo \ 40 lib/evas/canvas/efl_input_interface.eo \
42 lib/evas/canvas/efl_input_event.eo \ 41 lib/evas/canvas/efl_input_event.eo \
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index bcd1b80..24a4047 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -48,12 +48,6 @@
48 */ 48 */
49 49
50/** 50/**
51 * @ingroup Evas_Smart_Object_Clipped
52 *
53 * @{
54 */
55#include "canvas/efl_canvas_group_clipped.eo.h"
56/**
57 * @} 51 * @}
58 */ 52 */
59 53
diff --git a/src/lib/evas/canvas/efl_canvas_group_clipped.eo b/src/lib/evas/canvas/efl_canvas_group_clipped.eo
deleted file mode 100644
index 2f995f9..0000000
--- a/src/lib/evas/canvas/efl_canvas_group_clipped.eo
+++ /dev/null
@@ -1,10 +0,0 @@
1/* FIXME: This class needs to disappear and its functionality merged into
2 * standard smart objects (Efl.Canvas.Group). */
3abstract Efl.Canvas.Group.Clipped (Efl.Canvas.Group)
4{
5 [[Internal class representing a canvas object group with a clipper.]]
6 data: null;
7 implements {
8 Efl.Object.constructor;
9 }
10}
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 776c7fd..d3bfb98 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -4,8 +4,6 @@
4#include "evas_common_private.h" 4#include "evas_common_private.h"
5#include "evas_private.h" 5#include "evas_private.h"
6 6
7#define MY_CLASS EFL_CANVAS_GROUP_CLIPPED_CLASS
8
9#define CSO_DATA_GET(eo_obj, ptr) \ 7#define CSO_DATA_GET(eo_obj, ptr) \
10 Evas_Object_Smart_Clipped_Data *ptr = evas_object_smart_data_get(eo_obj); 8 Evas_Object_Smart_Clipped_Data *ptr = evas_object_smart_data_get(eo_obj);
11 9
@@ -107,14 +105,6 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem
107 evas_object_hide(cso->clipper); 105 evas_object_hide(cso->clipper);
108} 106}
109 107
110EOLIAN static Eo *
111_efl_canvas_group_clipped_efl_object_constructor(Eo *eo_obj, void *_pd EINA_UNUSED)
112{
113 // Setting this flag before the parent constructor on purpose.
114 efl_canvas_group_unclipped_set(eo_obj, EINA_FALSE);
115 return efl_constructor(efl_super(eo_obj, MY_CLASS));
116}
117
118/* Legacy only */ 108/* Legacy only */
119EAPI void 109EAPI void
120evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) 110evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc)
@@ -148,5 +138,3 @@ evas_object_smart_clipped_class_get(void)
148 class = &_sc; 138 class = &_sc;
149 return class; 139 return class;
150} 140}
151
152#include "canvas/efl_canvas_group_clipped.eo.c"