Add a bold variant of Katica and make that the system's default bold font.

..and do some minor tweaks to the font rendering code.

2 files changed, 2 insertions, 2 deletions

diff --git a/SharedGraphics/Font.cpp b/SharedGraphics/Font.cpp
index 990853a493..aca394a3b6 100644
--- a/SharedGraphics/Font.cpp
+++ b/SharedGraphics/Font.cpp
@@ -44,7 +44,7 @@ Font& Font::default_fixed_width_font()
 Font& Font::default_bold_font()
 {
     static Font* s_default_bold_font;
-    static const char* default_bold_font_path = "/res/fonts/CsillaBold7x10.font";
+    static const char* default_bold_font_path = "/res/fonts/KaticaBold10.font";
     if (!s_default_bold_font) {
         s_default_bold_font = Font::load_from_file(default_bold_font_path).leak_ref();
         ASSERT(s_default_bold_font);
diff --git a/SharedGraphics/Font.h b/SharedGraphics/Font.h
index b0b479ac5c..e972974c78 100644
--- a/SharedGraphics/Font.h
+++ b/SharedGraphics/Font.h
@@ -54,7 +54,7 @@ public:
 
     ~Font();
 
-    GlyphBitmap glyph_bitmap(char ch) const { return GlyphBitmap(&m_rows[(byte)ch * m_glyph_height], { m_glyph_width, m_glyph_height }); }
+    GlyphBitmap glyph_bitmap(char ch) const { return GlyphBitmap(&m_rows[(byte)ch * m_glyph_height], { glyph_width(ch), m_glyph_height }); }
 
     byte glyph_width(char ch) const { return m_fixed_width ? m_glyph_width : m_glyph_widths[(byte)ch]; }
     byte glyph_height() const { return m_glyph_height; }