josh/jes-ruby
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

determine baseline offset based on descender for "g" glyph

Browse Source
This commit is contained in:
Josh Holtrop 2014-06-26 14:09:02 -04:00
parent dd5b7bf8fd
commit 45d86d1e35
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/Font.cc
View File

@ -29,17 +29,20 @@ namespace jes
FT_Set_Pixel_Sizes(m_face, 0, size);
GlyphRef x_glyph = load_glyph('x');
if (x_glyph == NULL)
GlyphRef glyph = load_glyph('g');
if (glyph == NULL)
{
std::cerr << "Could not load 'x' glyph from font" << fname << std::endl;
std::cerr << "Could not load 'g' glyph from font" << fname << std::endl;
return false;
}
m_glyphs['x'] = x_glyph;
m_glyphs['g'] = glyph;
m_advance = x_glyph->get_advance();
m_advance = glyph->get_advance();
m_line_height = round_up_26_6(m_face->size->metrics.height);
#if 0
m_baseline_offset = round_up_26_6((m_face->size->metrics.height - (m_face->size->metrics.ascender - m_face->size->metrics.descender)) / 2 - m_face->size->metrics.descender);
#endif
m_baseline_offset = 1 - m_face->glyph->bitmap_top + m_face->glyph->bitmap.rows;
m_loaded = true;
return true;