From 2aeca668ce8151a3e30206d5227e1c59c697bba9 Mon Sep 17 00:00:00 2001 From: tasn Date: Wed, 16 Feb 2011 13:00:41 +0000 Subject: [PATCH] Evas textblock: Fixed possible issue with word/mixed wrapping. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@57089 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_textblock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index 12d6bbf..6e932a7 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -3168,9 +3168,15 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt, twrap = _layout_word_end(ti->text, wrap); wrap = _layout_word_next(ti->text, wrap); if (wrap >= 0) - return (str[wrap]) ? wrap : -1; + { + ch = GET_NEXT(str, wrap); + return (str[wrap]) ? wrap : -1; + } else if (twrap >= 0) - return (str[twrap]) ? twrap : -1; + { + ch = GET_NEXT(str, twrap); + return (str[twrap]) ? twrap : -1; + } } } return -1; -- 2.7.4