kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas: Fix evas grid 

It's a complete mess mixing legacy and EO in a really bad way.
This commit is contained in:
Jean-Philippe Andre 2017-09-06 15:57:35 +09:00
parent 46001cde38
commit 820b8a0e6f
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/evas/canvas/evas_object_grid.c
View File

@ -159,19 +159,17 @@ EVAS_SMART_SUBCLASS_NEW("Evas_Object_Grid", _evas_object_grid,
static void
_evas_object_grid_smart_add(Evas_Object *o)
{
Evas_Object_Smart_Clipped_Data *base;
Evas_Grid_Data *priv;
priv = evas_object_smart_data_get(o);
if (!priv)
{
priv = efl_data_ref(o, MY_CLASS);
evas_object_smart_data_set(o, priv);
}
// Grid is an ugly mix of legacy & eo...
base = evas_object_smart_data_get(o);
priv = efl_data_scope_get(o, MY_CLASS);
priv->base = *base;
evas_object_smart_data_set(o, priv);
priv->size.w = 100;
priv->size.h = 100;
_evas_object_grid_parent_sc->add(o);
}
static void
@ -189,7 +187,6 @@ _evas_object_grid_smart_del(Evas_Object *o)
free(opt);
l = eina_list_remove_list(l, l);
}
_evas_object_grid_parent_sc->del(o);
}
static void
@ -290,7 +287,6 @@ _evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSE
evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
return obj;
// return evas_object_smart_add(evas, _evas_object_grid_smart_class_new());
}
EOLIAN static Evas_Object*

2
src/lib/evas/canvas/evas_object_smart.c
View File

@ -1832,8 +1832,6 @@ _efl_canvas_group_group_clipped_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *sd,
// We must call this function BEFORE the constructor (yes, it's hacky)
EINA_SAFETY_ON_FALSE_RETURN(!sd->object);
sd->clipped = !!clipped;
if (clipped && !sd->data)
sd->data = calloc(1, sizeof(Evas_Object_Smart_Clipped_Data));
}
/* Internal EO APIs */