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

Evas font: fix size query again 

Some wrong variables were used in the rewrite at
8c6effae8e, basically reverting the original fix.
This commit is contained in:
Daniel Hirt 2016-08-07 11:13:16 +03:00
parent a71f0ed24b
commit 24ccd475b8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/evas/common/evas_font_query.c
View File

@ -353,14 +353,13 @@ evas_common_font_query_size(RGBA_Font *fn, const Evas_Text_Props *text_props, in
Evas_Coord cur_w = 0;
if (text_props->len > 1)
{
cur_w = last_glyph[-1].pen_after;
cur_w = glyph[-1].pen_after;
if (text_props->start > 0)
cur_w -= first_glyph[-1].pen_after;
}
cur_w += last_glyph->width + last_glyph->x_bear;
cur_w += glyph->width + glyph->x_bear;
#ifdef OT_SUPPORT
cur_w += EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET(
text_props->info->ot[text_props->start + text_props->len - 1]));
cur_w += EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET(*ot));
cur_cluster = ot->source_cluster;
ot--;