summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2018-05-25 10:09:13 -0700
committerCedric BAIL <cedric@osg.samsung.com>2018-05-25 10:09:15 -0700
commitcae57ff51bc5942a28f4f98c75183dc262df5008 (patch)
treebff935cef1cd3adf343d7623f57e843bde56ab71 /src/lib/edje
parent6e6ed72921aa1fb114115e2202f92126ea04b25b (diff)
edje: don't give a wrong Edje data when an Edje object has group parts
Summary: _edje_part_fetch() function gets an Edje which has the requested Edje_Real_Part. Basically, it gets main Edje of the given object. But, if a requested part is in a GROUP part, it gets the Edje of GROUP part. It shouldn't be passed to _edje_efl_text_text_get() function directly. @fix Test Plan: N/A Reviewers: herdsman, raster, cedric, woohyun Reviewed By: cedric Subscribers: #committers, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6149 Reviewed-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_util.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 71577832aa..7ab54bb4bd 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -6340,6 +6340,14 @@ edje_object_part_text_get(const Edje_Object *obj, const char *part)
6340 ERR("Invalid call on a non-text or non-textblock part: '%s' in group '%s'", part, ed->group); 6340 ERR("Invalid call on a non-text or non-textblock part: '%s' in group '%s'", part, ed->group);
6341 return NULL; 6341 return NULL;
6342 } 6342 }
6343
6344 ed = _edje_fetch(obj);
6345 if (!ed)
6346 {
6347 ERR("Failed to get Edje data from object: '%p'", obj);
6348 return NULL;
6349 }
6350
6343 return _edje_efl_text_text_get(obj, ed, part, EINA_TRUE, EINA_FALSE); 6351 return _edje_efl_text_text_get(obj, ed, part, EINA_TRUE, EINA_FALSE);
6344} 6352}
6345 6353