enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

E entry: Fixed issue with marup and text set/get. 

This fixes #1715 or at least should.

SVN revision: 79061
This commit is contained in:
Tom Hacohen 2012-11-09 19:41:06 +00:00
parent c6de6576c0
commit ac38ad5121
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/e_entry.c
View File

@ -101,16 +101,22 @@ e_entry_add(Evas *evas)
* @param text the text to set
*/
EAPI void
e_entry_text_set(Evas_Object *entry, const char *text)
e_entry_text_set(Evas_Object *entry, const char *_text)
{
E_Entry_Smart_Data *sd;
char *text = NULL;
if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
return;
text = evas_textblock_text_utf8_to_markup(
edje_object_part_object_get(sd->entry_object, ENTRY_PART_NAME),
_text);
edje_object_part_text_set(sd->entry_object, ENTRY_PART_NAME, text);
evas_object_smart_callback_call(entry, "changed", NULL);
if (text)
free(text);
}
/**
@ -123,11 +129,21 @@ EAPI const char *
e_entry_text_get(Evas_Object *entry)
{
E_Entry_Smart_Data *sd;
static char *text = NULL;
if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERR(NULL);
if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
return NULL;
return edje_object_part_text_get(sd->entry_object, ENTRY_PART_NAME);
if (text)
{
free(text);
text = NULL;
}
text = evas_textblock_text_markup_to_utf8(
edje_object_part_object_get(sd->entry_object, ENTRY_PART_NAME),
edje_object_part_text_get(sd->entry_object, ENTRY_PART_NAME));
return text;
}
/**