[EGIT] [core/efl] master 10/15: Edje: Return text defined in EDC in part_text_get

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=12146ddea63a47ff0cdacc47e4f02a13221eb84b

commit 12146ddea63a47ff0cdacc47e4f02a13221eb84b
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Mon Apr 25 15:41:27 2016 +0900

    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
---
 src/lib/edje/edje_util.c           | 12 +++++++++++-
 src/tests/edje/data/test_table.edc |  0
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index f8430fe..d81408a 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 0000000..e69de29

--