From 4aad57994ccd3c72f662f2348e2059e8c44c462d Mon Sep 17 00:00:00 2001 From: billiob Date: Sat, 1 May 2010 17:13:38 +0000 Subject: [PATCH] edje: get parts in a part type BOX/TABLE git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@48513 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/edje_util.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c index c746933..57d59cd 100644 --- a/src/lib/edje_util.c +++ b/src/lib/edje_util.c @@ -4216,19 +4216,36 @@ Edje_Real_Part * _edje_real_part_recursive_get_helper(Edje *ed, char **path) { Edje_Real_Part *rp; + Evas_Object *o; + Eina_List *l; //printf(" lookup: %s on %s\n", path[0], ed->parent ? ed->parent : "-"); rp = _edje_real_part_get(ed, path[0]); if (path[1] == NULL) return rp; - if ((!rp) || (rp->part->type != EDJE_PART_TYPE_GROUP) || - (!rp->swallowed_object)) return NULL; - - ed = _edje_fetch(rp->swallowed_object); - if (!ed) return NULL; - - path++; - return _edje_real_part_recursive_get_helper(ed, path); + if (!rp) return NULL; + switch (rp->part->type) + { + case EDJE_PART_TYPE_GROUP: + if (!rp->swallowed_object) return NULL; + ed = _edje_fetch(rp->swallowed_object); + if (!ed) return NULL; + path++; + return _edje_real_part_recursive_get_helper(ed, path); + case EDJE_PART_TYPE_BOX: case EDJE_PART_TYPE_TABLE: + if (!rp->items) return NULL; + path++; + EINA_LIST_FOREACH(rp->items, l, o) + { + ed = _edje_fetch(o); + if (!ed) return NULL; + if ((rp = _edje_real_part_recursive_get_helper(ed, path))) + return rp; + } + return NULL; + default: + return NULL; + } } -- 2.7.4