From 81616cec5d7cfb399d62730f9062d0aca71d91cd Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:32:45 +0000 Subject: [PATCH] Evas textblock and font engine: Fixed cursor position to be at the end of the current item, and not the end of the line, this looks nicer in bidi strings. Fixed querying char coords to return the current position of the NULL according to the text's alignment, not the paragraph's. SVN revision: 56419 --- .../src/lib/canvas/evas_object_textblock.c | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 65ad20f8fc..de76b06a80 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -6863,24 +6863,8 @@ evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C &x, &y, &w, &h); } - /* Handle bidi adjustments */ - if (_evas_textblock_cursor_is_at_the_end(cur)) - { -#ifdef BIDI_SUPPORT - if (EVAS_BIDI_PARAGRAPH_DIRECTION_IS_RTL(ti->bidi_props.props)) - { - x = ln->x; - } - else -#endif - { - x = ln->x + ln->w; - } - } - else - { - x += ln->x + _ITEM(ti)->x - ti->inset; - } + x += ln->x + _ITEM(ti)->x - ti->inset; + if (x < ln->x) { x = ln->x;