summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_smart.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-06 15:14:07 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 09:57:05 +0900
commit46001cde383997bd440c1d39e95ed8ffec7074cf (patch)
tree942af55c68f3a059b4207d114d9bb289ab09bf85 /src/lib/edje/edje_smart.c
parent7e2382853ee54a7e0a92a14cde52b1de5fa7313a (diff)
edje: Remove use of smart clipped data
This removes dependency on a legacy structure. Edje object does not change the smart data, unlike evas box and grid.
Diffstat (limited to 'src/lib/edje/edje_smart.c')
-rw-r--r--src/lib/edje/edje_smart.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 4d12f7e..843bb90 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -33,7 +33,8 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
33 efl_canvas_group_clipped_set(obj, EINA_TRUE); 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 = efl_provider_find(obj, EVAS_CANVAS_CLASS);
37 ed->base.clipper = (Evas_Object *) efl_canvas_group_clipper_get(obj);
37 ed->duration_scale = 1.0; 38 ed->duration_scale = 1.0;
38 _edje_lib_ref(); 39 _edje_lib_ref();
39 40
@@ -55,7 +56,6 @@ _edje_object_efl_object_destructor(Eo *obj, Edje *class_data)
55 class_data->file_obj = NULL; 56 class_data->file_obj = NULL;
56 } 57 }
57 efl_destructor(efl_super(obj, MY_CLASS)); 58 efl_destructor(efl_super(obj, MY_CLASS));
58 efl_data_unref(obj, class_data->base);
59} 59}
60 60
61EOLIAN static Eina_Strbuf * 61EOLIAN static Eina_Strbuf *
@@ -161,7 +161,6 @@ _edje_object_efl_canvas_group_group_del(Eo *obj, Edje *ed)
161#endif 161#endif
162 if (ed->persp) edje_object_perspective_set(obj, NULL); 162 if (ed->persp) edje_object_perspective_set(obj, NULL);
163 _edje_file_del(ed); 163 _edje_file_del(ed);
164 _edje_clean_objects(ed);
165 _edje_unref(ed); 164 _edje_unref(ed);
166 _edje_lib_unref(); 165 _edje_lib_unref();
167 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 166 efl_canvas_group_del(efl_super(obj, MY_CLASS));