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

evas: don't assume anymore that text_node is != NULL. 

SVN revision: 59231
This commit is contained in:
Cedric BAIL 2011-05-06 09:00:44 +00:00
parent a82b3834b3
commit 139e49792d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3162,6 +3162,7 @@ _layout_get_wordwrap(Ctxt *c, Evas_Object_Textblock_Format *fmt,
const Evas_Object_Textblock_Text_Item *ti, size_t line_start,
const char *breaks)
{
if (!ti->parent.text_node) return -1;
return _layout_get_word_mixwrap_common(c, fmt, ti, EINA_FALSE, line_start,
breaks);
}
@ -3172,6 +3173,7 @@ _layout_get_mixedwrap(Ctxt *c, Evas_Object_Textblock_Format *fmt,
const Evas_Object_Textblock_Text_Item *ti, size_t line_start,
const char *breaks)
{
if (!ti->parent.text_node) return -1;
return _layout_get_word_mixwrap_common(c, fmt, ti, EINA_TRUE, line_start,
breaks);
}
@ -3403,7 +3405,7 @@ _layout_visualize_par(Ctxt *c)
if (!line_breaks)
{
/* Only relevant in those cases */
if (it->format->wrap_word || it->format->wrap_mixed)
if ((it->format->wrap_word || it->format->wrap_mixed) && it->text_node)
{
size_t len =
eina_ustrbuf_length_get(