diff options
author | Carsten Haitzler <raster@rasterman.com> | 2012-06-20 04:53:21 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2012-06-20 04:53:21 +0000 |
commit | 9a56eec38c4f5492053bf40a3d884226e082ae8e (patch) | |
tree | 98b7deddeeb8a34ec5f5873d5bc5da75051cb512 /legacy/evas/src/lib/engines/common/evas_font_main.c | |
parent | 3c2fbc3e9ade6c659b75e21eaa0753b47047e2bb (diff) |
woooow line advance broken for bitmap fonts!
SVN revision: 72513
Diffstat (limited to '')
-rw-r--r-- | legacy/evas/src/lib/engines/common/evas_font_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c index 5d6cf5ba24..d2373ff71d 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_main.c +++ b/legacy/evas/src/lib/engines/common/evas_font_main.c | |||
@@ -218,7 +218,11 @@ evas_common_font_get_line_advance(RGBA_Font *fn) | |||
218 | fi->src->current_size = fi->size; | 218 | fi->src->current_size = fi->size; |
219 | } | 219 | } |
220 | val = (int)fi->src->ft.face->size->metrics.height; | 220 | val = (int)fi->src->ft.face->size->metrics.height; |
221 | if (fi->src->ft.face->units_per_EM == 0) | 221 | if ((fi->src->ft.face->bbox.yMax == 0) && |
222 | (fi->src->ft.face->bbox.yMin == 0) && | ||
223 | (fi->src->ft.face->units_per_EM == 0)) | ||
224 | return val >> 6; | ||
225 | else if (fi->src->ft.face->units_per_EM == 0) | ||
222 | return val; | 226 | return val; |
223 | return val >> 6; | 227 | return val >> 6; |
224 | // dv = (fi->src->ft.orig_upem * 2048) / fi->src->ft.face->units_per_EM; | 228 | // dv = (fi->src->ft.orig_upem * 2048) / fi->src->ft.face->units_per_EM; |