summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorDaniel Hirt <daniel.hirt@samsung.com>2016-08-07 11:13:16 +0300
committerDaniel Hirt <daniel.hirt@samsung.com>2016-08-07 11:26:53 +0300
commit24ccd475b87696e1adb4e48cfff22c8263100a1d (patch)
tree0945c85eb5047c799401f7a4214db0ed5ac41d92 /src/lib/evas/common
parenta71f0ed24bc7ff41234edc353e69b04af2caec12 (diff)
Evas font: fix size query again
Some wrong variables were used in the rewrite at 8c6effae8ee027a928bcee79968a0b21d8250487, basically reverting the original fix.
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_font_query.c7
1 files 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 1d9b7dc66e..2deb8386e4 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
353 Evas_Coord cur_w = 0; 353 Evas_Coord cur_w = 0;
354 if (text_props->len > 1) 354 if (text_props->len > 1)
355 { 355 {
356 cur_w = last_glyph[-1].pen_after; 356 cur_w = glyph[-1].pen_after;
357 if (text_props->start > 0) 357 if (text_props->start > 0)
358 cur_w -= first_glyph[-1].pen_after; 358 cur_w -= first_glyph[-1].pen_after;
359 } 359 }
360 cur_w += last_glyph->width + last_glyph->x_bear; 360 cur_w += glyph->width + glyph->x_bear;
361#ifdef OT_SUPPORT 361#ifdef OT_SUPPORT
362 cur_w += EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET( 362 cur_w += EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET(*ot));
363 text_props->info->ot[text_props->start + text_props->len - 1]));
364 363
365 cur_cluster = ot->source_cluster; 364 cur_cluster = ot->source_cluster;
366 ot--; 365 ot--;