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

Evas textblock: Fixed misuse of evas_bidi_is_rtl_char. 

SVN revision: 56447
This commit is contained in:
Tom Hacohen 2011-01-30 10:35:44 +00:00
parent 7e376019b7
commit e7ca8b9294
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6777,8 +6777,8 @@ evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord
if (dir && dir_cur && dir_cur->node) if (dir && dir_cur && dir_cur->node)
{ {
#ifdef BIDI_SUPPORT #ifdef BIDI_SUPPORT
*dir = (evas_bidi_is_rtl_char(dir_cur->node->bidi_props, dir_cur->pos, *dir = (evas_bidi_is_rtl_char(dir_cur->node->bidi_props, 0,
0)) ? dir_cur->pos)) ?
EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR; EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR;
#else #else
*dir = EVAS_BIDI_DIRECTION_LTR; *dir = EVAS_BIDI_DIRECTION_LTR;
@ -7125,7 +7125,7 @@ _evas_textblock_range_calc_x_w(const Evas_Object_Textblock_Item *it,
if ((start && !switch_items) || (!start && switch_items)) if ((start && !switch_items) || (!start && switch_items))
{ {
#ifdef BIDI_SUPPORT #ifdef BIDI_SUPPORT
if (evas_bidi_is_rtl_char(it->text_node->bidi_props, 0, 0)) if (it->bidi_props.dir == EVAS_BIDI_DIRECTION_RTL)
{ {
*w = *x + *w; *w = *x + *w;
*x = 0; *x = 0;
@ -7139,7 +7139,7 @@ _evas_textblock_range_calc_x_w(const Evas_Object_Textblock_Item *it,
else else
{ {
#ifdef BIDI_SUPPORT #ifdef BIDI_SUPPORT
if (evas_bidi_is_rtl_char(it->text_node->bidi_props, 0, 0)) if (it->bidi_props.dir == EVAS_BIDI_DIRECTION_RTL)
{ {
*x = *x + *w; *x = *x + *w;
*w = it->adv - *x; *w = it->adv - *x;
@ -7265,7 +7265,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
} }
#ifdef BIDI_SUPPORT #ifdef BIDI_SUPPORT
if (evas_bidi_is_rtl_char(ti->parent.text_node->bidi_props, 0, 0)) if (ti->parent.bidi_props.dir == EVAS_BIDI_DIRECTION_RTL)
{ {
x = x1 + w1; x = x1 + w1;
w = x2 + w2 - x; w = x2 + w2 - x;