From 45d86d1e357c5fb756fa9af0032ad3d06fb3350f Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Thu, 26 Jun 2014 14:09:02 -0400
Subject: [PATCH] determine baseline offset based on descender for "g" glyph

---
 src/gui/Font.cc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/gui/Font.cc b/src/gui/Font.cc
index 01b81eb..4c46019 100644
--- a/src/gui/Font.cc
+++ b/src/gui/Font.cc
@@ -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;