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

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:
Carsten Haitzler 2014-04-16 12:27:40 +09:00
parent 1678d272af
commit 9fb0640d57
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/edje/edje_load.c
View File

@ -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:
@ -1965,4 +1965,4 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *sig, const char *sou
if (ed_parent) if (ed_parent)
_edje_util_message_send(ed_parent, EDJE_QUEUE_SCRIPT, _edje_util_message_send(ed_parent, EDJE_QUEUE_SCRIPT,
EDJE_MESSAGE_SIGNAL, 0, &emsg); EDJE_MESSAGE_SIGNAL, 0, &emsg);
} }

10
src/lib/edje/edje_smart.c
View File

@ -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))
{ {