aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje/edje_util.c
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-10-01 11:37:42 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-10-01 12:00:56 +0300
commitaf1595fd0160f76de82cddeb2576143f65492c0b (patch)
tree6daf93dd1d769f9335117413375493fbc0805277 /src/lib/edje/edje_util.c
parenteina debug - add missing unlock in erite err case (diff)
downloadefl-af1595fd0160f76de82cddeb2576143f65492c0b.tar.gz
Canvas layout: fix legacy text set
Keep the legacy code path when using edje_object_part_text_set. Fixes e's notification that got broken after 3642b3ae679e3bedba4155fb9e54b44483b3b9e1. Also, limit new efl_text_markup set to TEXTBLOCK parts.
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 8ed6cc3d0a..c175c140f1 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -1861,7 +1861,7 @@ _edje_object_part_text_raw_generic_set(Edje *ed, Evas_Object *obj, Edje_Real_Par
else
if (text)
{
- if (set_markup)
+ if (set_markup && (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK))
{
char *mkup;
mkup =
@@ -6134,7 +6134,7 @@ edje_object_part_swallow_get(const Edje_Object *obj, const char *part)
EAPI Eina_Bool
edje_object_part_text_set(const Edje_Object *obj, const char *part, const char *text)
{
- efl_text_markup_set(efl_part(obj, part), text);
+ efl_text_set(efl_part(obj, part), text);
return EINA_TRUE;
}