summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-06 12:13:58 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 09:57:05 +0900
commit7ef714924ac6676ce73e340d07949e7c2a5b5a98 (patch)
tree417f2b06340b3555b7531a729de8ba0b7884c291
parent9ed6838f17e43621eea6f388eb2f5eceba14ecad (diff)
evas: Fix crash with smart objects
This is due to the previous patches.
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/elementary/elm_widget.c2
-rw-r--r--src/lib/emotion/emotion_smart.c2
-rw-r--r--src/lib/evas/Evas_Internal.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object_event_grabber.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c2
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c2
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c32
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c12
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
11 files changed, 30 insertions, 32 deletions
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 9ef755e..4d12f7e 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -30,7 +30,7 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
30 Evas *e; 30 Evas *e;
31 void *tmp; 31 void *tmp;
32 32
33 efl_canvas_group_unclipped_set(obj, EINA_FALSE); 33 efl_canvas_group_clipped_set(obj, EINA_TRUE);
34 obj = efl_constructor(efl_super(obj, MY_CLASS)); 34 obj = efl_constructor(efl_super(obj, MY_CLASS));
35 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 35 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
36 ed->base = evas_object_smart_data_get(obj); 36 ed->base = evas_object_smart_data_get(obj);
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index d1a2ac7..ccdc7cf 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -198,7 +198,7 @@ _elm_pan_add(Evas *evas)
198EOLIAN static Eo * 198EOLIAN static Eo *
199_elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) 199_elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
200{ 200{
201 efl_canvas_group_unclipped_set(obj, EINA_FALSE); 201 efl_canvas_group_clipped_set(obj, EINA_TRUE);
202 obj = efl_constructor(efl_super(obj, MY_PAN_CLASS)); 202 obj = efl_constructor(efl_super(obj, MY_PAN_CLASS));
203 efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY); 203 efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
204 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 204 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index e2947eb..57f4c4a 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -6183,7 +6183,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE
6183 Eo *parent = NULL; 6183 Eo *parent = NULL;
6184 6184
6185 sd->on_create = EINA_TRUE; 6185 sd->on_create = EINA_TRUE;
6186 efl_canvas_group_unclipped_set(obj, EINA_TRUE); 6186 efl_canvas_group_clipped_set(obj, EINA_FALSE);
6187 obj = efl_constructor(efl_super(obj, MY_CLASS)); 6187 obj = efl_constructor(efl_super(obj, MY_CLASS));
6188 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 6188 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
6189 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 6189 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 5b2dbf2..b2a7370 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -254,7 +254,7 @@ emotion_object_add(Evas *evas)
254EOLIAN static Eo * 254EOLIAN static Eo *
255_efl_canvas_video_efl_object_constructor(Eo *obj, Efl_Canvas_Video_Data *pd EINA_UNUSED) 255_efl_canvas_video_efl_object_constructor(Eo *obj, Efl_Canvas_Video_Data *pd EINA_UNUSED)
256{ 256{
257 efl_canvas_group_unclipped_set(obj, EINA_TRUE); 257 efl_canvas_group_clipped_set(obj, EINA_FALSE);
258 obj = efl_constructor(efl_super(obj, MY_CLASS)); 258 obj = efl_constructor(efl_super(obj, MY_CLASS));
259 efl_canvas_object_type_set(obj, E_OBJ_NAME); 259 efl_canvas_object_type_set(obj, E_OBJ_NAME);
260 260
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index b4eb056..f0d71b5 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -53,7 +53,7 @@ EOAPI void efl_canvas_object_legacy_ctor(Eo *obj);
53EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type); 53EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
54EOAPI void efl_canvas_group_add(Eo *obj); 54EOAPI void efl_canvas_group_add(Eo *obj);
55EOAPI void efl_canvas_group_del(Eo *obj); 55EOAPI void efl_canvas_group_del(Eo *obj);
56EOAPI void efl_canvas_group_unclipped_set(Eo *obj, Eina_Bool unclipped); 56EOAPI void efl_canvas_group_clipped_set(Eo *obj, Eina_Bool unclipped);
57 57
58EOAPI void *efl_input_legacy_info_get(const Eo *obj); 58EOAPI void *efl_input_legacy_info_get(const Eo *obj);
59EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv); 59EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv);
diff --git a/src/lib/evas/canvas/efl_canvas_object_event_grabber.c b/src/lib/evas/canvas/efl_canvas_object_event_grabber.c
index 18dc8c3..7623af9 100644
--- a/src/lib/evas/canvas/efl_canvas_object_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_object_event_grabber.c
@@ -320,7 +320,7 @@ _efl_canvas_object_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_E
320{ 320{
321 Evas_Object_Protected_Data *obj; 321 Evas_Object_Protected_Data *obj;
322 322
323 efl_canvas_group_unclipped_set(eo_obj, EINA_TRUE); 323 efl_canvas_group_clipped_set(eo_obj, EINA_FALSE);
324 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 324 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
325 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY); 325 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY);
326 obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 326 obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 08e630b..5c48628 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -484,7 +484,7 @@ evas_object_box_add(Evas *evas)
484EOLIAN static Eo * 484EOLIAN static Eo *
485_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED) 485_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
486{ 486{
487 efl_canvas_group_unclipped_set(obj, EINA_FALSE); 487 efl_canvas_group_clipped_set(obj, EINA_TRUE);
488 obj = efl_constructor(efl_super(obj, MY_CLASS)); 488 obj = efl_constructor(efl_super(obj, MY_CLASS));
489 evas_object_smart_callbacks_descriptions_set(obj, _signals); 489 evas_object_smart_callbacks_descriptions_set(obj, _signals);
490 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 490 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 9b31c42..e8b9598 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -285,7 +285,7 @@ evas_object_grid_add(Evas *evas)
285EOLIAN static Eo * 285EOLIAN static Eo *
286_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED) 286_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
287{ 287{
288 efl_canvas_group_unclipped_set(obj, EINA_FALSE); 288 efl_canvas_group_clipped_set(obj, EINA_TRUE);
289 obj = efl_constructor(efl_super(obj, MY_CLASS)); 289 obj = efl_constructor(efl_super(obj, MY_CLASS));
290 evas_object_smart_attach(obj, _evas_object_grid_smart_class_new()); 290 evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
291 291
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index b28b25f..7d98022 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -48,7 +48,7 @@ struct _Evas_Smart_Data
48 Eina_Bool need_recalculate : 1; 48 Eina_Bool need_recalculate : 1;
49 Eina_Bool update_boundingbox_needed : 1; 49 Eina_Bool update_boundingbox_needed : 1;
50 Eina_Bool group_del_called : 1; 50 Eina_Bool group_del_called : 1;
51 Eina_Bool unclipped : 1; /* If true, NOT a smart_clipped object */ 51 Eina_Bool clipped : 1; /* If true, smart clipped */
52 Eina_Bool data_nofree : 1; /* If true, do NOT free the data */ 52 Eina_Bool data_nofree : 1; /* If true, do NOT free the data */
53 Eina_Bool constructed : 1; /* constructor finished */ 53 Eina_Bool constructed : 1; /* constructor finished */
54}; 54};
@@ -129,7 +129,7 @@ static const Evas_Object_Func object_func =
129static inline Evas_Object * 129static inline Evas_Object *
130_smart_clipper_get(Evas_Smart_Data *o) 130_smart_clipper_get(Evas_Smart_Data *o)
131{ 131{
132 Evas_Object_Smart_Clipped_Data *cso = (!o->unclipped) ? o->data : NULL; 132 Evas_Object_Smart_Clipped_Data *cso = o->clipped ? o->data : NULL;
133 return cso ? cso->clipper : NULL; 133 return cso ? cso->clipper : NULL;
134} 134}
135 135
@@ -294,7 +294,7 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
294 if (!smart->is_frame_top && (smart->is_frame != obj->is_frame)) 294 if (!smart->is_frame_top && (smart->is_frame != obj->is_frame))
295 efl_canvas_object_is_frame_object_set(eo_obj, smart->is_frame); 295 efl_canvas_object_is_frame_object_set(eo_obj, smart->is_frame);
296 296
297 if (!o->unclipped && o->constructed) 297 if (o->clipped && o->constructed)
298 { 298 {
299 Evas_Object *clipper = _smart_clipper_get(o); 299 Evas_Object *clipper = _smart_clipper_get(o);
300 Eina_Bool had_clippees = efl_canvas_object_clipees_has(clipper); 300 Eina_Bool had_clippees = efl_canvas_object_clipees_has(clipper);
@@ -339,7 +339,7 @@ _efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUS
339 339
340 o = efl_data_scope_get(smart_obj, MY_CLASS); 340 o = efl_data_scope_get(smart_obj, MY_CLASS);
341 341
342 if (!o->unclipped) 342 if (o->clipped)
343 { 343 {
344 Evas_Object *clipper = _smart_clipper_get(o); 344 Evas_Object *clipper = _smart_clipper_get(o);
345 345
@@ -675,7 +675,7 @@ _efl_canvas_group_efl_object_constructor(Eo *eo_obj, Evas_Smart_Data *sd)
675 obj->is_smart = EINA_TRUE; 675 obj->is_smart = EINA_TRUE;
676 obj->func = &object_func; 676 obj->func = &object_func;
677 obj->private_data = efl_data_ref(eo_obj, MY_CLASS); 677 obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
678 if (!sd->unclipped) 678 if (sd->clipped)
679 _evas_object_smart_clipped_init(eo_obj); 679 _evas_object_smart_clipped_init(eo_obj);
680 680
681 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY); 681 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY);
@@ -798,7 +798,7 @@ _efl_canvas_group_group_add(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUS
798EOLIAN static void 798EOLIAN static void
799_efl_canvas_group_group_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) 799_efl_canvas_group_group_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
800{ 800{
801 if (!o->unclipped) 801 if (o->clipped)
802 { 802 {
803 _efl_canvas_group_group_members_all_del_internal(o); 803 _efl_canvas_group_group_members_all_del_internal(o);
804 } 804 }
@@ -816,7 +816,7 @@ _efl_canvas_group_efl_canvas_object_no_render_set(Eo *eo_obj, Evas_Smart_Data *o
816 816
817 efl_canvas_object_no_render_set(efl_super(eo_obj, MY_CLASS), enable); 817 efl_canvas_object_no_render_set(efl_super(eo_obj, MY_CLASS), enable);
818 818
819 clipper = (!o->unclipped) ? _smart_clipper_get(o) : NULL; 819 clipper = (o->clipped) ? _smart_clipper_get(o) : NULL;
820 EINA_INLIST_FOREACH(o->contained, obj2) 820 EINA_INLIST_FOREACH(o->contained, obj2)
821 { 821 {
822 if (obj2->object != clipper) 822 if (obj2->object != clipper)
@@ -832,7 +832,7 @@ _efl_canvas_group_efl_gfx_color_set(Eo *eo_obj, Evas_Smart_Data *o, int r, int g
832 832
833 efl_gfx_color_set(efl_super(eo_obj, MY_CLASS), r, g, b, a); 833 efl_gfx_color_set(efl_super(eo_obj, MY_CLASS), r, g, b, a);
834 834
835 if (!o->unclipped) 835 if (o->clipped)
836 { 836 {
837 Evas_Object *clipper = _smart_clipper_get(o); 837 Evas_Object *clipper = _smart_clipper_get(o);
838 EINA_SAFETY_ON_NULL_RETURN(clipper); 838 EINA_SAFETY_ON_NULL_RETURN(clipper);
@@ -850,7 +850,7 @@ _efl_canvas_group_efl_gfx_visible_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool
850 850
851 efl_gfx_visible_set(efl_super(eo_obj, MY_CLASS), vis); 851 efl_gfx_visible_set(efl_super(eo_obj, MY_CLASS), vis);
852 852
853 if (!o->unclipped) 853 if (o->clipped)
854 { 854 {
855 Evas_Object *clipper = _smart_clipper_get(o); 855 Evas_Object *clipper = _smart_clipper_get(o);
856 EINA_SAFETY_ON_NULL_RETURN(clipper); 856 EINA_SAFETY_ON_NULL_RETURN(clipper);
@@ -869,7 +869,7 @@ _efl_canvas_group_efl_gfx_position_set(Eo *eo_obj, Evas_Smart_Data *o, Evas_Coor
869 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y)) 869 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y))
870 return; 870 return;
871 871
872 if (!o->unclipped) 872 if (o->clipped)
873 _evas_object_smart_clipped_smart_move_internal(eo_obj, x, y); 873 _evas_object_smart_clipped_smart_move_internal(eo_obj, x, y);
874 efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), x, y); 874 efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), x, y);
875} 875}
@@ -883,7 +883,7 @@ _efl_canvas_group_efl_canvas_object_clip_set(Eo *eo_obj, Evas_Smart_Data *o, Eva
883 883
884 efl_canvas_object_clip_set(efl_super(eo_obj, MY_CLASS), clip); 884 efl_canvas_object_clip_set(efl_super(eo_obj, MY_CLASS), clip);
885 885
886 if (!o->unclipped) 886 if (o->clipped)
887 { 887 {
888 Evas_Object *clipper = _smart_clipper_get(o); 888 Evas_Object *clipper = _smart_clipper_get(o);
889 EINA_SAFETY_ON_NULL_RETURN(clipper); 889 EINA_SAFETY_ON_NULL_RETURN(clipper);
@@ -1820,12 +1820,12 @@ _efl_canvas_group_efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUS
1820 1820
1821/* Internal EO */ 1821/* Internal EO */
1822static void 1822static void
1823_efl_canvas_group_group_unclipped_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *sd, Eina_Bool unclipped) 1823_efl_canvas_group_group_clipped_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *sd, Eina_Bool clipped)
1824{ 1824{
1825 // We must call this function BEFORE the constructor (yes, it's hacky) 1825 // We must call this function BEFORE the constructor (yes, it's hacky)
1826 EINA_SAFETY_ON_FALSE_RETURN(!sd->object); 1826 EINA_SAFETY_ON_FALSE_RETURN(!sd->object);
1827 sd->unclipped = !!unclipped; 1827 sd->clipped = !!clipped;
1828 if (!unclipped && !sd->data) 1828 if (clipped && !sd->data)
1829 sd->data = calloc(1, sizeof(Evas_Object_Smart_Clipped_Data)); 1829 sd->data = calloc(1, sizeof(Evas_Object_Smart_Clipped_Data));
1830} 1830}
1831 1831
@@ -1833,11 +1833,11 @@ _efl_canvas_group_group_unclipped_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *s
1833 1833
1834EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_add) 1834EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_add)
1835EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_del) 1835EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_del)
1836EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_group_unclipped_set, EFL_FUNC_CALL(enable), Eina_Bool enable) 1836EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_group_clipped_set, EFL_FUNC_CALL(enable), Eina_Bool enable)
1837 1837
1838#define EFL_CANVAS_GROUP_EXTRA_OPS \ 1838#define EFL_CANVAS_GROUP_EXTRA_OPS \
1839 EFL_OBJECT_OP_FUNC(efl_canvas_group_add, _efl_canvas_group_group_add), \ 1839 EFL_OBJECT_OP_FUNC(efl_canvas_group_add, _efl_canvas_group_group_add), \
1840 EFL_OBJECT_OP_FUNC(efl_canvas_group_del, _efl_canvas_group_group_del), \ 1840 EFL_OBJECT_OP_FUNC(efl_canvas_group_del, _efl_canvas_group_group_del), \
1841 EFL_OBJECT_OP_FUNC(efl_canvas_group_unclipped_set, _efl_canvas_group_group_unclipped_set) 1841 EFL_OBJECT_OP_FUNC(efl_canvas_group_clipped_set, _efl_canvas_group_group_clipped_set)
1842 1842
1843#include "canvas/efl_canvas_group.eo.c" 1843#include "canvas/efl_canvas_group.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index d3bfb98..f023045 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -1,5 +1,4 @@
1#define EFL_CANVAS_GROUP_PROTECTED 1/* Legacy only */
2#define EFL_CANVAS_GROUP_BETA
3 2
4#include "evas_common_private.h" 3#include "evas_common_private.h"
5#include "evas_private.h" 4#include "evas_private.h"
@@ -20,13 +19,13 @@ evas_object_smart_clipped_clipper_get(const Evas_Object *eo_obj)
20} 19}
21 20
22static void 21static void
23evas_object_smart_clipped_smart_add_legacy(Evas_Object *eo_obj) 22evas_object_smart_clipped_smart_add(Evas_Object *eo_obj)
24{ 23{
25 _evas_object_smart_clipped_init(eo_obj); 24 _evas_object_smart_clipped_init(eo_obj);
26} 25}
27 26
28static void 27static void
29evas_object_smart_clipped_smart_del_legacy(Evas_Object *eo_obj) 28evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
30{ 29{
31 CSO_DATA_GET_OR_RETURN(eo_obj, cso); 30 CSO_DATA_GET_OR_RETURN(eo_obj, cso);
32 31
@@ -105,15 +104,14 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem
105 evas_object_hide(cso->clipper); 104 evas_object_hide(cso->clipper);
106} 105}
107 106
108/* Legacy only */
109EAPI void 107EAPI void
110evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) 108evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc)
111{ 109{
112 if (!sc) 110 if (!sc)
113 return; 111 return;
114 112
115 sc->add = evas_object_smart_clipped_smart_add_legacy; 113 sc->add = evas_object_smart_clipped_smart_add;
116 sc->del = evas_object_smart_clipped_smart_del_legacy; 114 sc->del = evas_object_smart_clipped_smart_del;
117 sc->move = evas_object_smart_clipped_smart_move; 115 sc->move = evas_object_smart_clipped_smart_move;
118 sc->show = evas_object_smart_clipped_smart_show; 116 sc->show = evas_object_smart_clipped_smart_show;
119 sc->hide = evas_object_smart_clipped_smart_hide; 117 sc->hide = evas_object_smart_clipped_smart_hide;
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index b6ad3dc..cfbb8bc 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -988,7 +988,7 @@ evas_object_table_add(Evas *evas)
988EOLIAN static Eo * 988EOLIAN static Eo *
989_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED) 989_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
990{ 990{
991 efl_canvas_group_unclipped_set(obj, EINA_FALSE); 991 efl_canvas_group_clipped_set(obj, EINA_TRUE);
992 obj = efl_constructor(efl_super(obj, MY_CLASS)); 992 obj = efl_constructor(efl_super(obj, MY_CLASS));
993 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 993 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
994 994