summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_grid.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-06 15:57:35 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 09:57:05 +0900
commit820b8a0e6f65642c2cfd4196f8d08fe444bce310 (patch)
treee3302cfd273aad82087c1703526439dd211e80e1 /src/lib/evas/canvas/evas_object_grid.c
parent46001cde383997bd440c1d39e95ed8ffec7074cf (diff)
evas: Fix evas grid
It's a complete mess mixing legacy and EO in a really bad way.
Diffstat (limited to 'src/lib/evas/canvas/evas_object_grid.c')
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index e8b9598..8aab7cf 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -159,19 +159,17 @@ EVAS_SMART_SUBCLASS_NEW("Evas_Object_Grid", _evas_object_grid,
159static void 159static void
160_evas_object_grid_smart_add(Evas_Object *o) 160_evas_object_grid_smart_add(Evas_Object *o)
161{ 161{
162 Evas_Object_Smart_Clipped_Data *base;
162 Evas_Grid_Data *priv; 163 Evas_Grid_Data *priv;
163 164
164 priv = evas_object_smart_data_get(o); 165 // Grid is an ugly mix of legacy & eo...
165 if (!priv) 166 base = evas_object_smart_data_get(o);
166 { 167 priv = efl_data_scope_get(o, MY_CLASS);
167 priv = efl_data_ref(o, MY_CLASS); 168 priv->base = *base;
168 evas_object_smart_data_set(o, priv); 169 evas_object_smart_data_set(o, priv);
169 }
170 170
171 priv->size.w = 100; 171 priv->size.w = 100;
172 priv->size.h = 100; 172 priv->size.h = 100;
173
174 _evas_object_grid_parent_sc->add(o);
175} 173}
176 174
177static void 175static void
@@ -189,7 +187,6 @@ _evas_object_grid_smart_del(Evas_Object *o)
189 free(opt); 187 free(opt);
190 l = eina_list_remove_list(l, l); 188 l = eina_list_remove_list(l, l);
191 } 189 }
192 _evas_object_grid_parent_sc->del(o);
193} 190}
194 191
195static void 192static void
@@ -290,7 +287,6 @@ _evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSE
290 evas_object_smart_attach(obj, _evas_object_grid_smart_class_new()); 287 evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
291 288
292 return obj; 289 return obj;
293// return evas_object_smart_add(evas, _evas_object_grid_smart_class_new());
294} 290}
295 291
296EOLIAN static Evas_Object* 292EOLIAN static Evas_Object*