enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

futzing around with tilan's mono font issue - some commented otu debugging - 

use the all caps enum for bitmap fonts now...


SVN revision: 31496
This commit is contained in:
Carsten Haitzler 2007-08-25 11:54:17 +00:00
parent c1d4685780
commit 2a04c23a33
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -37,7 +37,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index)
free(fg);
return NULL;
}
if (fg->glyph->format != ft_glyph_format_bitmap)
if (fg->glyph->format != FT_GLYPH_FORMAT_BITMAP)
{
error = FT_Glyph_To_Bitmap(&(fg->glyph), ft_render_mode_normal, 0, 1);
if (error)

14
legacy/evas/src/lib/engines/common/evas_font_query.c
View File

@ -96,6 +96,20 @@ evas_common_font_query_inset(RGBA_Font *fn, const char *text)
index = evas_common_font_glyph_search(fn, &fi, gl);
fg = evas_common_font_int_cache_glyph_get(fi, index);
if (!fg) return 0;
/*
printf("fg->glyph_out->left = %i\n"
"fi->src->ft.face->glyph->bitmap_left = %i\n"
"fi->src->ft.face->glyph->metrics.horiBearingX = %i\n"
"fi->src->ft.face->glyph->metrics.horiBearingY = %i\n"
"fi->src->ft.face->glyph->metrics.horiAdvance = %i\n"
,
(int)fg->glyph_out->left,
(int)fi->src->ft.face->glyph->bitmap_left,
(int)fi->src->ft.face->glyph->metrics.horiBearingX >> 6,
(int)fi->src->ft.face->glyph->metrics.horiBearingY >> 6,
(int)fi->src->ft.face->glyph->metrics.horiAdvance >> 6
);
*/
return fg->glyph_out->left;
}