forked from enlightenment/efl
Evas textblock: Started using advancement for wrapping.
SVN revision: 56481
This commit is contained in:
parent
1285647c17
commit
b8635d16ea
|
@ -2514,7 +2514,7 @@ _layout_text_add_item(Ctxt *c, Evas_Object_Textblock_Format *fmt,
|
||||||
static void
|
static void
|
||||||
_layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Textblock_Node_Text *n, int start, int off, const char *repch)
|
_layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Textblock_Node_Text *n, int start, int off, const char *repch)
|
||||||
{
|
{
|
||||||
int tw, th, new_line, empty_item;
|
int tw, new_line, empty_item;
|
||||||
int wrap, twrap, ch, index, white_stripped;
|
int wrap, twrap, ch, index, white_stripped;
|
||||||
Eina_Unicode *alloc_str = NULL;
|
Eina_Unicode *alloc_str = NULL;
|
||||||
const Eina_Unicode *str = EINA_UNICODE_EMPTY_STRING;
|
const Eina_Unicode *str = EINA_UNICODE_EMPTY_STRING;
|
||||||
|
@ -2617,10 +2617,10 @@ skip:
|
||||||
&ti->parent.text_props, ti->parent.text_node->bidi_props,
|
&ti->parent.text_props, ti->parent.text_node->bidi_props,
|
||||||
ti->parent.text_pos, tmp_len);
|
ti->parent.text_pos, tmp_len);
|
||||||
}
|
}
|
||||||
tw = th = 0;
|
tw = 0;
|
||||||
if (fmt->font.font)
|
if (fmt->font.font)
|
||||||
c->ENFN->font_string_size_get(c->ENDT, fmt->font.font, ti->text,
|
tw = c->ENFN->font_h_advance_get(c->ENDT, ti->format->font.font,
|
||||||
&ti->parent.text_props, &tw, &th);
|
ti->text, &ti->parent.text_props);
|
||||||
/* Check if we need to wrap, i.e the text is bigger than the width
|
/* Check if we need to wrap, i.e the text is bigger than the width
|
||||||
* Only calculate wrapping if the width of the object is > 0 */
|
* Only calculate wrapping if the width of the object is > 0 */
|
||||||
if ((c->w >= 0) &&
|
if ((c->w >= 0) &&
|
||||||
|
|
Loading…
Reference in New Issue