vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas textblock: Fixed range geometry get in some cases involving rtl. 

SVN revision: 56416
This commit is contained in:
Tom Hacohen 2011-01-30 10:32:27 +00:00
parent 9f36a734b2
commit 06957098c6
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7165,17 +7165,30 @@ _evas_textblock_cursor_range_in_line_geometry_get(
return NULL;
}
/* This also takes bidi into account because of the positions
* in the text are taken into account */
if (x2 > x1)
/* Make x2 the one on the right */
if (x2 < x1)
{
w = x2 - x1;
x = x1;
Evas_Coord tmp;
tmp = x1;
x1 = x2;
x2 = tmp;
tmp = w1;
w1 = w2;
w2 = tmp;
}
#ifdef BIDI_SUPPORT
if (evas_bidi_is_rtl_char(&ti->bidi_props, 0))
{
x = x1 + w1;
w = x2 + w2 - x;
}
else
#endif
{
w = x1 - x2;
x = x2;
x = x1;
w = x2 - x1;
}
}
else
@ -7223,7 +7236,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
#ifdef BIDI_SUPPORT
if (evas_bidi_is_rtl_char(&ti->bidi_props, 0))
{
w = x;
w = x + w;
x = 0;
}
else
@ -7284,6 +7297,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
#ifdef BIDI_SUPPORT
if (evas_bidi_is_rtl_char(&ti->bidi_props, 0))
{
x += w;
w = it2->w - x;
}
else