enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas textblock: Fixed cursor_content_get's handling of formats. 

Formats are now correctly enclosed with <> when returned, instead of just
the text being returned.

SVN revision: 62439
This commit is contained in:
Tom Hacohen 2011-08-14 11:26:45 +00:00
parent 026f8798dc
commit 73036290d6
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -7272,11 +7272,40 @@ evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur)
if (!cur || !cur->node) return NULL; if (!cur || !cur->node) return NULL;
if (evas_textblock_cursor_format_is_visible_get(cur)) if (evas_textblock_cursor_format_is_visible_get(cur))
{ {
const char *tmp; size_t len;
tmp = evas_textblock_node_format_text_get( const char *fstr;
char *ret;
int pop = 0;
fstr = evas_textblock_node_format_text_get(
_evas_textblock_node_visible_at_pos_get( _evas_textblock_node_visible_at_pos_get(
evas_textblock_cursor_format_get(cur))); evas_textblock_cursor_format_get(cur)));
return (tmp) ? strdup(tmp) : NULL;
if (!fstr)
return NULL;
if (*fstr == '-') pop = 1;
while ((*fstr == ' ') || (*fstr == '+') || (*fstr == '-')) fstr++;
len = strlen(fstr);
{
char *tmp;
if (pop)
{
ret = tmp = malloc(len + 3 + 1); /* </> and the null */
memcpy(tmp, "</", 2);
tmp += 2;
}
else
{
ret = tmp = malloc(len + 2 + 1); /* <> and the null */
*tmp = '<';
tmp++;
}
memcpy(tmp, fstr, len);
memcpy(tmp + len, ">", 2); /* Including the null */
}
return ret;
} }
ustr = eina_ustrbuf_string_get(cur->node->unicode); ustr = eina_ustrbuf_string_get(cur->node->unicode);