kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas textblock: Fixed format_append/prepend. 

It should only treat format passed as a tag if it was passed with <>.
Otherwise, it should be treated as a regular format.

SVN revision: 61993
This commit is contained in:
Tom Hacohen 2011-08-02 12:17:09 +00:00
parent 19363f446e
commit 4f82ddea77
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,7 +568,7 @@ _style_match_tag(Evas_Textblock_Style *ts, const char *s, size_t tag_len, size_t
EINA_INLIST_FOREACH(ts->tags, tag) EINA_INLIST_FOREACH(ts->tags, tag)
{ {
if (tag->tag_len != tag_len) continue; if (tag->tag_len != tag_len) continue;
if (!strcmp(tag->tag, s)) if (!strncmp(tag->tag, s, tag_len))
{ {
*replace_len = tag->replace_len; *replace_len = tag->replace_len;
return tag->replace; return tag->replace;
@ -4880,13 +4880,13 @@ evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char
{ {
/* If we reached to a tag ending, analyze the tag */ /* If we reached to a tag ending, analyze the tag */
char *ttag; char *ttag;
size_t ttag_len = tag_end - tag_start -1; size_t ttag_len = tag_end - tag_start;
ttag = malloc(ttag_len + 1); ttag = malloc(ttag_len + 1);
if (ttag) if (ttag)
{ {
memcpy(ttag, tag_start + 1, ttag_len); memcpy(ttag, tag_start, ttag_len);
ttag[ttag_len] = 0; ttag[ttag_len] = 0;
evas_textblock_cursor_format_prepend(cur, ttag); evas_textblock_cursor_format_prepend(cur, ttag);
free(ttag); free(ttag);
@ -4922,7 +4922,7 @@ evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char
{ {
if (tag_start) if (tag_start)
{ {
tag_end = p; tag_end = p + 1;
s = p + 1; s = p + 1;
} }
} }
@ -6846,17 +6846,24 @@ _evas_textblock_node_format_free(Evas_Object_Textblock *o,
* @return Returns the new format node * @return Returns the new format node
*/ */
static Evas_Object_Textblock_Node_Format * static Evas_Object_Textblock_Node_Format *
_evas_textblock_node_format_new(Evas_Object_Textblock *o, const char *format) _evas_textblock_node_format_new(Evas_Object_Textblock *o, const char *_format)
{ {
Evas_Object_Textblock_Node_Format *n; Evas_Object_Textblock_Node_Format *n;
const char *format = _format;
n = calloc(1, sizeof(Evas_Object_Textblock_Node_Format)); n = calloc(1, sizeof(Evas_Object_Textblock_Node_Format));
/* Create orig_format and format */ /* Create orig_format and format */
if (format[0] == '<')
{ {
const char *match; const char *match;
size_t format_len = strlen(format); size_t format_len;
size_t replace_len; size_t replace_len;
format++; /* Advance after '<' */
format_len = strlen(format);
if (format[format_len - 1] == '>')
format_len--; /* We don't care about '>' */
match = _style_match_tag(o->style, format, format_len, &replace_len); match = _style_match_tag(o->style, format, format_len, &replace_len);
if (match) if (match)
{ {
@ -6903,6 +6910,12 @@ _evas_textblock_node_format_new(Evas_Object_Textblock *o, const char *format)
n->format = eina_stringshare_ref(n->orig_format); n->format = eina_stringshare_ref(n->orig_format);
} }
} }
/* Just use as is, it's a special format. */
else
{
n->orig_format = eina_stringshare_add(format);
n->format = eina_stringshare_ref(n->orig_format);
}
format = n->format; format = n->format;