From 829b48aebd61ac8278d4110a2a2d91106ee2e0c5 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 13 Apr 2011 10:22:55 +0000 Subject: [PATCH] Evas textblock: Fixed a wrong test for end of string. SVN revision: 58624 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 406eedbe12..956472f70b 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -3067,7 +3067,6 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt, int orig_wrap; Eina_Unicode ch; const Eina_Unicode *str = GET_ITEM_TEXT(ti); - /* FIXME-tom: a lot of str[] to check if NULL, need to fix that. */ wrap = _layout_text_cutoff_get(c, fmt, ti); /* Avoiding too small textblocks to even contain one char */ @@ -3101,7 +3100,7 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt, { wrap = twrap; ch = GET_PREV(str, wrap); - return (str[wrap]) ? wrap : -1; + return (!IS_AT_END(ti, wrap)) ? wrap : -1; } } }