kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas Textblock: Update bidi_level during layout and use it for decoration

This commit is contained in:
Daniel Hirt 2015-08-31 17:33:31 +03:00
parent 4b64909c45
commit 71f5f6eaa9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -390,6 +390,7 @@ struct _Evas_Object_Textblock_Item
size_t text_pos; /**< Position of this item in textblock line. */
#ifdef BIDI_SUPPORT
size_t visual_pos; /**< Visual position of this item. */
size_t bidi_level;
#endif
Evas_Textblock_Item_Type type; /**< EVAS_TEXTBLOCK_ITEM_TEXT or EVAS_TEXTBLOCK_ITEM_FORMAT */
@ -3492,6 +3493,10 @@ loop_advance:
x += it->adv + obs_adv;
if ((it->w > 0) && ((it->x + it->w) > c->ln->w)) c->ln->w = it->x + it->w;
if (c->ln->par->bidi_props)
{
it->bidi_level = c->ln->par->bidi_props->embedding_levels[it->text_pos];
}
}
/* clear obstacle info for this line */
@ -12380,7 +12385,6 @@ _evas_textblock_items_get(const Evas_Object *obj)
Evas_Object_Textblock_Paragraph *par;
Evas_Textblock_Data *o = eo_data_scope_get(obj, MY_CLASS);
printf("Populating Items:\n");
EINA_INLIST_FOREACH(o->paragraphs, par)
{
@ -12389,8 +12393,6 @@ _evas_textblock_items_get(const Evas_Object *obj)
if (!par->visible) break;
_layout_update_bidi_props(o, par);
EINA_INLIST_FOREACH(par->lines, ln)
{
Evas_Object_Textblock_Item *it;
@ -12416,17 +12418,13 @@ _evas_textblock_items_get(const Evas_Object *obj)
Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(it);
d->script = ti->text_props.script;
d->is_rtl = (ti->text_props.bidi_dir == EVAS_BIDI_DIRECTION_RTL);
if (par->bidi_props)
{
d->bidi_level = par->bidi_props->embedding_levels[it->text_pos];
}
d->bidi_level = it->bidi_level;
RGBA_Font_Int *rfi = ti->text_props.font_instance;
if (rfi)
d->font_src = rfi->src->name;
}
d->rect = eina_rectangle_new(ln->x + it->x + marginl, y, it->w, it->h);
rects = eina_list_append(rects, d);
printf(" -- it->valign=%f\n", it->format->valign);
}
}
evas_bidi_paragraph_props_unref(par->bidi_props);