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

als search for format items. 

SVN revision: 36720
This commit is contained in:
Carsten Haitzler 2008-10-16 14:18:50 +00:00
parent 9460febabb
commit b386c7ff6e
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,8 +301,14 @@ _strbuf_append(char *strbuf, const char *text, int *strbuf_len, int *strbuf_allo
{
int text_len;
if ((!text) || (text[0] == '\0'))
if (!text)
return strbuf;
if ((!strbuf) && (text[0] == '\0'))
{
*strbuf_len = 0;
*strbuf_alloc = 1;
return strdup(text);
}
text_len = strlen(text);
return _strbuf_append_int(strbuf, text, text_len, strbuf_len, strbuf_alloc);
@ -2065,7 +2071,6 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
c->align = 0.0;
_format_command_init();
/* setup default base style */
if ((c->o->style) && (c->o->style->default_tag))
{
@ -2259,6 +2264,12 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node *n, in
Evas_Object_Textblock *o;
o = (Evas_Object_Textblock *)(obj->object_data);
for (l = (Evas_Object_List *)o->nodes; l; l = l->next)
{
Evas_Object_Textblock_Node *nn;
nn = l;
}
for (l = (Evas_Object_List *)o->lines; l; l = l->next)
{
Evas_Object_Textblock_Line *ln;
@ -2279,6 +2290,18 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node *n, in
}
}
}
for (ll = (Evas_Object_List *)ln->format_items; ll; ll = ll->next)
{
Evas_Object_Textblock_Format_Item *it;
it = (Evas_Object_Textblock_Format_Item *)ll;
if (it->source_node == n)
{
*lnr = ln;
*itr = it;
return;
}
}
}
}