Evas textblock: Fix and simplify _find_layout_item_line_match which is an helper...
authortasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 15 Sep 2010 10:24:07 +0000 (10:24 +0000)
committertasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 15 Sep 2010 10:24:07 +0000 (10:24 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@52295 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/canvas/evas_object_textblock.c

index 779d586..d20ad91 100644 (file)
@@ -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;
+                    }
                }
           }
      }