herdsman pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=24ccd475b87696e1adb4e48cfff22c8263100a1d
commit 24ccd475b87696e1adb4e48cfff22c8263100a1d Author: Daniel Hirt <[email protected]> Date: Sun Aug 7 11:13:16 2016 +0300 Evas font: fix size query again Some wrong variables were used in the rewrite at 8c6effae8ee027a928bcee79968a0b21d8250487, basically reverting the original fix. --- src/lib/evas/common/evas_font_query.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c index 1d9b7dc..2deb838 100644 --- a/src/lib/evas/common/evas_font_query.c +++ b/src/lib/evas/common/evas_font_query.c @@ -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--; --
