forked from enlightenment/efl
eo null object complaints - silence.
This commit is contained in:
parent
164233ffb6
commit
1678d272af
|
@ -1224,7 +1224,7 @@ _edje_object_collect(Edje *ed)
|
|||
break;
|
||||
}
|
||||
case EDJE_USER_SWALLOW:
|
||||
edje_object_part_unswallow(NULL, eud->u.swallow.child);
|
||||
edje_object_part_unswallow(ed->obj, eud->u.swallow.child);
|
||||
break;
|
||||
case EDJE_USER_DRAG_STEP:
|
||||
case EDJE_USER_DRAG_PAGE:
|
||||
|
@ -1965,4 +1965,4 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *sig, const char *sou
|
|||
if (ed_parent)
|
||||
_edje_util_message_send(ed_parent, EDJE_QUEUE_SCRIPT,
|
||||
EDJE_MESSAGE_SIGNAL, 0, &emsg);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -166,13 +166,15 @@ _edje_evas_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
|
|||
ep = ed->table_parts[i];
|
||||
if ((ep->type == EDJE_RP_TYPE_TEXT) && (ep->typedata.text))
|
||||
{
|
||||
evas_object_move(ep->object,
|
||||
ed->x + ep->x + ep->typedata.text->offset.x,
|
||||
ed->y + ep->y + ep->typedata.text->offset.y);
|
||||
if (ep->object)
|
||||
evas_object_move(ep->object,
|
||||
ed->x + ep->x + ep->typedata.text->offset.x,
|
||||
ed->y + ep->y + ep->typedata.text->offset.y);
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(ep->object, ed->x + ep->x, ed->y + ep->y);
|
||||
if (ep->object)
|
||||
evas_object_move(ep->object, ed->x + ep->x, ed->y + ep->y);
|
||||
if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
|
||||
(ep->typedata.swallow))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue