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

Evas textblock: Fixed evas_textblock_cursor_range_geometry_get which didn't work when across multiple paragraphs. 

SVN revision: 57027
This commit is contained in:
Tom Hacohen 2011-02-14 16:14:26 +00:00
parent b2bf107e38
commit 0229e71b48
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7953,7 +7953,7 @@ evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, cons
}
else
{
Evas_Object_Textblock_Line *lni;
Evas_Object_Textblock_Line *plni, *lni;
Eina_List *rects2 = NULL;
/* Handle the first line */
rects = _evas_textblock_cursor_range_in_line_geometry_get(ln1,
@ -7961,15 +7961,26 @@ evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, cons
/* Handle the lines between the first and the last line */
lni = (Evas_Object_Textblock_Line *) EINA_INLIST_GET(ln1)->next;
if (!lni && (ln1->par != ln2->par))
{
lni = ((Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(ln1->par)->next)->lines;
}
while (lni && (lni != ln2))
{
tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
rects = eina_list_append(rects, tr);
tr->x = lni->x;
tr->y = lni->y;
tr->x = lni->par->x + lni->x;
tr->y = lni->par->y + lni->y;
tr->h = lni->h;
tr->w = lni->w;
plni = lni;
lni = (Evas_Object_Textblock_Line *) EINA_INLIST_GET(lni)->next;
if (!lni && (plni->par != ln2->par))
{
lni = ((Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(plni->par)->next)->lines;
}
}
rects2 = _evas_textblock_cursor_range_in_line_geometry_get(ln2,
NULL, cur2);