aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2018-09-28 16:13:39 +0900
committerSangHyeon Jade Lee <sh10233.lee@samsung.com>2018-09-28 16:14:00 +0900
commit9fc687a8c3b57c9bd74d48e3ae757ed9f9d3cb7b (patch)
treed64fe733a2bb5ff4d7eb1936ff54163ada8416ec /src/lib/edje
parentelm_interface_scrollable: fix using wrong variable. (diff)
downloadefl-9fc687a8c3b57c9bd74d48e3ae757ed9f9d3cb7b.tar.gz
edje: call recalc in part_text_get if there is no available text data
Summary: If edje_text_get is called before any edje_text_set function call, it return null, because rp->typedata.text->text is only set by edje_text_set function. If there is no available text data, find it from rp(edc). ref 7bbf18a950c027a365fea1b88e8dc3f16bb81abe Test Plan: make check Reviewers: zmike, id213sin, herdsman Reviewed By: id213sin Subscribers: Hermet, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6961
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_util.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index a4d7276f1d..35de55b3f7 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2080,13 +2080,28 @@ _edje_efl_text_text_get(const Eo *obj EINA_UNUSED, Edje *ed, const char *part,
{
const char *entry;
if (legacy)
- entry = rp->typedata.text->text;
+ {
+ if (rp->typedata.text->text)
+ {
+ entry = rp->typedata.text->text;
+ }
+ else
+ {
+#ifdef EDJE_CALC_CACHE
+ if (rp->invalidate || ed->all_part_change)
+#else
+ if (ed->dirty)
+#endif
+ _edje_recalc_do(ed);
+ entry = evas_object_textblock_text_markup_get(rp->object);
+ }
+ }
else
{
if (get_markup)
{
#ifdef EDJE_CALC_CACHE
- if (rp->invalidate)
+ if (rp->invalidate || ed->all_part_change)
#else
if (ed->dirty)
#endif