summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-07-10 14:24:51 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-07-10 14:40:42 -0400
commit66213df2f5a537b670cf48a52a71c8160fa4bb26 (patch)
tree20b517f158def1a862f9f765e622afc332c11047
parentaa921c553baaa2265c1a5b42e8bf89c9f343b30e (diff)
edje: fix reapplying markup text on file/group change
Summary: this was being stored as regular text when it was actually markup @fix Depends on D9208 Reviewers: cedric Reviewed By: cedric Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9209
-rw-r--r--src/lib/edje/edje_load.c5
-rw-r--r--src/lib/edje/edje_private.h1
-rw-r--r--src/lib/edje/edje_util.c3
3 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 786dae00d9..0e257a902d 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1683,7 +1683,10 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
1683 switch (eud->u.string.type) 1683 switch (eud->u.string.type)
1684 { 1684 {
1685 case EDJE_TEXT_TYPE_NORMAL: 1685 case EDJE_TEXT_TYPE_NORMAL:
1686 edje_object_part_text_set(obj, eud->part, eud->u.string.text); 1686 efl_text_set(efl_part(obj, eud->part), eud->u.string.text);
1687 break;
1688 case EDJE_TEXT_TYPE_MARKUP:
1689 efl_text_markup_set(efl_part(obj, eud->part), eud->u.string.text);
1687 break; 1690 break;
1688 case EDJE_TEXT_TYPE_ESCAPED: 1691 case EDJE_TEXT_TYPE_ESCAPED:
1689 edje_object_part_text_escaped_set(obj, eud->part, eud->u.string.text); 1692 edje_object_part_text_escaped_set(obj, eud->part, eud->u.string.text);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index cedc4d6fa6..c8362dbb56 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2085,6 +2085,7 @@ struct _Edje_Signal_Callback
2085typedef enum 2085typedef enum
2086{ 2086{
2087 EDJE_TEXT_TYPE_NORMAL, 2087 EDJE_TEXT_TYPE_NORMAL,
2088 EDJE_TEXT_TYPE_MARKUP,
2088 EDJE_TEXT_TYPE_ESCAPED, 2089 EDJE_TEXT_TYPE_ESCAPED,
2089 EDJE_TEXT_TYPE_UNESCAPED 2090 EDJE_TEXT_TYPE_UNESCAPED
2090} Edje_Text_Type; 2091} Edje_Text_Type;
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index e73da61d54..827c95c0d1 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2114,7 +2114,8 @@ _edje_efl_text_text_set(Eo *obj, Edje *ed, const char *part, const char *text,
2114 } 2114 }
2115 int_ret = _edje_object_part_text_raw_generic_set(ed, obj, rp, part, text, 2115 int_ret = _edje_object_part_text_raw_generic_set(ed, obj, rp, part, text,
2116 set_markup, legacy); 2116 set_markup, legacy);
2117 _edje_user_define_string(ed, part, rp->typedata.text->text, EDJE_TEXT_TYPE_NORMAL); 2117 _edje_user_define_string(ed, part, rp->typedata.text->text,
2118 set_markup ? EDJE_TEXT_TYPE_MARKUP : EDJE_TEXT_TYPE_NORMAL);
2118 return int_ret; 2119 return int_ret;
2119} 2120}
2120 2121