From 2ee05386b41219b03e282f8e2d2cdcb3f1f12bda Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 17 Jan 2001 21:31:30 +0000 Subject: [PATCH] minor fixup if last char in string has 0 boundingbox width :) SVN revision: 4123 --- legacy/evas/src/evas_gl_routines.c | 7 ++++++- legacy/evas/src/evas_x11_routines.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/evas_gl_routines.c b/legacy/evas/src/evas_gl_routines.c index af925d809d..1bfadad7a0 100644 --- a/legacy/evas/src/evas_gl_routines.c +++ b/legacy/evas/src/evas_gl_routines.c @@ -2058,7 +2058,12 @@ __evas_gl_text_get_size(Evas_GL_Font *fn, char *text, int *w, int *h) if (i == 0) pw += ((-g->metrics.bearingX) / 64); if (text[i + 1] == 0) /* last char - ineternationalization issue */ - pw += (g->metrics.bbox.xMax / 64); + { + if ((g->metrics.bbox.xMax / 64) == 0) + pw += (g->metrics.advance / 64); + else + pw += (g->metrics.bbox.xMax / 64); + } else pw += g->metrics.advance / 64; } diff --git a/legacy/evas/src/evas_x11_routines.c b/legacy/evas/src/evas_x11_routines.c index 9571de3114..668719c585 100644 --- a/legacy/evas/src/evas_x11_routines.c +++ b/legacy/evas/src/evas_x11_routines.c @@ -1104,7 +1104,12 @@ __evas_x11_text_get_size(Evas_X11_Font *fn, char *text, int *w, int *h) if (i == 0) pw += ((-g->metrics.bearingX) / 64); if (text[i + 1] == 0) /* last char - ineternationalization issue */ - pw += (g->metrics.bbox.xMax / 64); + { + if ((g->metrics.bbox.xMax / 64) == 0) + pw += (g->metrics.advance / 64); + else + pw += (g->metrics.bbox.xMax / 64); + } else pw += g->metrics.advance / 64; }