diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-04-25 15:41:27 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-04-26 11:36:23 +0900 |
| commit | 12146ddea63a47ff0cdacc47e4f02a13221eb84b (patch) | |
| tree | bffc47c824adb2e48abc30135df0f203d8cc7f3b | |
| parent | 97422856ceee280269ea29248317e19f4a6225dc (diff) | |
| download | efl-12146ddea63a47ff0cdacc47e4f02a13221eb84b.tar.gz | |
Edje: Return text defined in EDC in part_text_get
This function was returning only the text defined by part_text_set.
This is a behaviour change, as part_text_get() no longer returns NULL
if there is a string defined in EDC. But this now means that the actual
value displayed on screen can be retrieved by a simple API call.
@feature
| -rw-r--r-- | src/lib/edje/edje_util.c | 12 | ||||
| -rw-r--r-- | src/tests/edje/data/test_table.edc | 0 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index f8430fe552..d81408a914 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -2278,7 +2278,17 @@ _edje_object_part_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { if (rp->part->type == EDJE_PART_TYPE_TEXT) { - return rp->typedata.text->text; + Edje_Part_Description_Text *desc; + if (rp->typedata.text->text) + return rp->typedata.text->text; + else + { + desc = (Edje_Part_Description_Text *) rp->chosen_description; + if (desc->text.text.translated) + return desc->text.text.translated; + else + return desc->text.text.str; + } } if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK) { diff --git a/src/tests/edje/data/test_table.edc b/src/tests/edje/data/test_table.edc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/src/tests/edje/data/test_table.edc |