Evas textblock: Reverted my last commit and added WooHyun's instead.

They were pretty similar, but I think WooHyun's was better.
Thanks to WooHyun for the patch.

SVN revision: 75461
This commit is contained in:
Tom Hacohen 2012-08-20 11:05:48 +00:00
parent ba506122e1
commit 05136cc824
1 changed files with 15 additions and 7 deletions

View File

@ -8841,14 +8841,22 @@ _evas_textblock_cursor_range_in_line_geometry_get(
tr->w = w;
}
}
else if ((it1 == it2) && (it1->type == EVAS_TEXTBLOCK_ITEM_FORMAT))
else if ((it1 == it2) && (it1->type != EVAS_TEXTBLOCK_ITEM_TEXT))
{
tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
rects = eina_list_append(rects, tr);
tr->x = ln->x + it1->x;
tr->y = ln->par->y + ln->y;
tr->h = ln->h;
tr->w = it1->w;
Evas_Coord x, w;
x = 0;
w = it1->w;
_evas_textblock_range_calc_x_w(it1, &x, &w, EINA_TRUE,
switch_items);
if (w > 0)
{
tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
rects = eina_list_append(rects, tr);
tr->x = ln->x + it1->x + x;
tr->y = ln->par->y + ln->y;
tr->h = ln->h;
tr->w = w;
}
}
else if (it1 != it2)
{