From 8b6083ec2699bdb264161c65d4ad9513230a0db6 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 15 Sep 2010 10:24:07 +0000 Subject: [PATCH] Evas textblock: Fix and simplify _find_layout_item_line_match which is an helper function used in many parts of textblock. SVN revision: 52295 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 779d5869b0..d20ad91969 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -3026,20 +3026,20 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node_Text * { if (it->source_node == n) { - Evas_Object_Textblock_Item *itn; int p; - itn = (Evas_Object_Textblock_Item *)(((Eina_Inlist *)it)->next); p = (int)(it->source_pos + eina_unicode_strlen(it->text)); - if ((p > pos) || - ((p == pos) && (!lnn) && - ((!itn) || - ((itn) && (itn->source_node != n))))) + if (((pos >= (int) it->source_pos) && (pos < p))) { *lnr = ln; *itr = it; return; } + else if (p == pos) + { + *lnr = ln; + *itr = it; + } } } }