forked from enlightenment/efl
Revert "Evas textblock: Shape a lot less when splitting to items because of script/bidi direction."
Was broken. This reverts commit d2bc8fd8b516a640c3eb098071a80d751494024a. SVN revision: 56471
This commit is contained in:
parent
9f0ce7a272
commit
f1d77279cd
|
@ -2479,7 +2479,6 @@ _layout_text_add_and_split_item(Ctxt *c, Evas_Object_Textblock_Format *fmt,
|
||||||
int tw, th, adv, inset;
|
int tw, th, adv, inset;
|
||||||
|
|
||||||
int cutoff, len;
|
int cutoff, len;
|
||||||
int shape_len = 0;
|
|
||||||
|
|
||||||
|
|
||||||
cutoff = 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);
|
new_ti->parent.text_pos);
|
||||||
evas_common_text_props_script_set (&new_ti->parent.text_props,
|
evas_common_text_props_script_set (&new_ti->parent.text_props,
|
||||||
new_ti->text);
|
new_ti->text);
|
||||||
shape_len = len - cutoff;
|
c->ENFN->font_shape(c->ENDT, new_ti->format->font.font,
|
||||||
}
|
new_ti->text,
|
||||||
else if (shape_len)
|
&new_ti->parent.text_props,
|
||||||
{
|
new_ti->parent.text_node->bidi_props,
|
||||||
c->ENFN->font_shape(c->ENDT, ti->format->font.font,
|
new_ti->parent.text_pos, len - cutoff);
|
||||||
ti->text,
|
|
||||||
&ti->parent.text_props,
|
|
||||||
ti->parent.text_node->bidi_props,
|
|
||||||
ti->parent.text_pos, shape_len);
|
|
||||||
shape_len = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue