From: Enlightenment S. <no-...@en...> - 2011-01-30 10:34:24
|
Log: Evas textblock: Use pen position for cursors, selections and etc as this is exactly what pen is for. Author: tasn Date: 2011-01-30 02:34:18 -0800 (Sun, 30 Jan 2011) New Revision: 56434 Trac: http://trac.enlightenment.org/e/changeset/56434 Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-01-30 10:34:13 UTC (rev 56433) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-01-30 10:34:18 UTC (rev 56434) @@ -6698,7 +6698,7 @@ dir_cur = cur; if (ctype == EVAS_TEXTBLOCK_CURSOR_UNDER) { - ret = evas_textblock_cursor_char_geometry_get(cur, cx, cy, cw, ch); + ret = evas_textblock_cursor_pen_geometry_get(cur, cx, cy, cw, ch); } else if (ctype == EVAS_TEXTBLOCK_CURSOR_BEFORE) { @@ -6729,7 +6729,7 @@ { before_char = EINA_TRUE; } - ret = evas_textblock_cursor_char_geometry_get( + ret = evas_textblock_cursor_pen_geometry_get( dir_cur, &x, &y, &w, &h); #ifdef BIDI_SUPPORT /* Adjust if the char is an rtl char */ @@ -6753,7 +6753,7 @@ } else { - ret = evas_textblock_cursor_char_geometry_get( + ret = evas_textblock_cursor_pen_geometry_get( dir_cur, &x, &y, &w, &h); } if (ret >= 0) @@ -7215,7 +7215,7 @@ int ret; ti = _ITEM_TEXT(it1); - ret = cur->ENFN->font_char_coords_get(cur->ENDT, + ret = cur->ENFN->font_pen_coords_get(cur->ENDT, ti->format->font.font, ti->text, &ti->parent.bidi_props, start, @@ -7224,7 +7224,7 @@ { return NULL; } - ret = cur->ENFN->font_char_coords_get(cur->ENDT, + ret = cur->ENFN->font_pen_coords_get(cur->ENDT, ti->format->font.font, ti->text, &ti->parent.bidi_props, end, @@ -7284,7 +7284,7 @@ int ret; ti = _ITEM_TEXT(it1); - ret = cur->ENFN->font_char_coords_get(cur->ENDT, + ret = cur->ENFN->font_pen_coords_get(cur->ENDT, ti->format->font.font, ti->text, &ti->parent.bidi_props, start, @@ -7338,7 +7338,7 @@ int ret; ti = _ITEM_TEXT(it2); - ret = cur->ENFN->font_char_coords_get(cur->ENDT, + ret = cur->ENFN->font_pen_coords_get(cur->ENDT, ti->format->font.font, ti->text, &ti->parent.bidi_props, end, |