From 74ef88e4f63022e867f256ba540757c553f54fd6 Mon Sep 17 00:00:00 2001 From: tasn Date: Sun, 30 Jan 2011 10:38:22 +0000 Subject: [PATCH] Revert "Evas textblock: Shape a lot less when splitting to items because of script/bidi direction." Was broken. This reverts commit d2bc8fd8b516a640c3eb098071a80d751494024a. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56471 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_textblock.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index 9b84343..fad139e 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -2479,7 +2479,6 @@ _layout_text_add_and_split_item(Ctxt *c, Evas_Object_Textblock_Format *fmt, int tw, th, adv, inset; int cutoff, len; - int shape_len = 0; cutoff = 0; @@ -2506,16 +2505,11 @@ _layout_text_add_and_split_item(Ctxt *c, Evas_Object_Textblock_Format *fmt, new_ti->parent.text_pos); evas_common_text_props_script_set (&new_ti->parent.text_props, new_ti->text); - shape_len = len - cutoff; - } - else if (shape_len) - { - c->ENFN->font_shape(c->ENDT, ti->format->font.font, - ti->text, - &ti->parent.text_props, - ti->parent.text_node->bidi_props, - ti->parent.text_pos, shape_len); - shape_len = 0; + c->ENFN->font_shape(c->ENDT, new_ti->format->font.font, + new_ti->text, + &new_ti->parent.text_props, + new_ti->parent.text_node->bidi_props, + new_ti->parent.text_pos, len - cutoff); } } -- 2.7.4