forked from enlightenment/efl
Revert "eo null object complaints - silence."
This reverts commit 1678d272af
.
... actually... on second thought... i think eo just needs to sensibly
handle null objects.
This commit is contained in:
parent
1678d272af
commit
9fb0640d57
|
@ -1224,7 +1224,7 @@ _edje_object_collect(Edje *ed)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case EDJE_USER_SWALLOW:
|
case EDJE_USER_SWALLOW:
|
||||||
edje_object_part_unswallow(ed->obj, eud->u.swallow.child);
|
edje_object_part_unswallow(NULL, eud->u.swallow.child);
|
||||||
break;
|
break;
|
||||||
case EDJE_USER_DRAG_STEP:
|
case EDJE_USER_DRAG_STEP:
|
||||||
case EDJE_USER_DRAG_PAGE:
|
case EDJE_USER_DRAG_PAGE:
|
||||||
|
|
|
@ -166,15 +166,13 @@ _edje_evas_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
|
||||||
ep = ed->table_parts[i];
|
ep = ed->table_parts[i];
|
||||||
if ((ep->type == EDJE_RP_TYPE_TEXT) && (ep->typedata.text))
|
if ((ep->type == EDJE_RP_TYPE_TEXT) && (ep->typedata.text))
|
||||||
{
|
{
|
||||||
if (ep->object)
|
evas_object_move(ep->object,
|
||||||
evas_object_move(ep->object,
|
ed->x + ep->x + ep->typedata.text->offset.x,
|
||||||
ed->x + ep->x + ep->typedata.text->offset.x,
|
ed->y + ep->y + ep->typedata.text->offset.y);
|
||||||
ed->y + ep->y + ep->typedata.text->offset.y);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (ep->object)
|
evas_object_move(ep->object, ed->x + ep->x, ed->y + ep->y);
|
||||||
evas_object_move(ep->object, ed->x + ep->x, ed->y + ep->y);
|
|
||||||
if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
|
if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
|
||||||
(ep->typedata.swallow))
|
(ep->typedata.swallow))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue