From 6c02effe2742db4b2ab134e9d66fdcbb2a4e0f03 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 25 Oct 2009 15:14:08 +0000
Subject: [PATCH] Fix 1-pixel wide characters

---
 layouts/demo.xml   | 2 +-
 src/ft/Font.cpp    | 4 ++--
 src/gui2/Theme.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layouts/demo.xml b/layouts/demo.xml
index a1f684b..a91e49d 100644
--- a/layouts/demo.xml
+++ b/layouts/demo.xml
@@ -5,7 +5,7 @@
     <button name="btn1" label="One"
             x="5" y="5" width="80" height="25" />
     <button name="btn2" label="Two"/>
-    <button label="Hello, World!"
+    <button label="abcdefghijklmnopqrstuvwxyz"
            x="5" y="60" width="100" height="20"/>
   </window>
 </layout>
diff --git a/src/ft/Font.cpp b/src/ft/Font.cpp
index 559e777..de8169e 100644
--- a/src/ft/Font.cpp
+++ b/src/ft/Font.cpp
@@ -79,8 +79,8 @@ Glyph::Glyph(FT_Face& face, FT_ULong uch, FontType type)
       
    // Pad out the bitmap to be a power-of-2 square
       
-   int tex_width = next_power_of_2(bmp.width);
-   int tex_height = next_power_of_2(bmp.rows);
+   int tex_width = max(next_power_of_2(bmp.width), 2);
+   int tex_height = max(next_power_of_2(bmp.rows), 2);
 
    GLubyte* expanded = new GLubyte[2 * tex_width * tex_height];
 
diff --git a/src/gui2/Theme.cpp b/src/gui2/Theme.cpp
index c069099..6345f20 100644
--- a/src/gui2/Theme.cpp
+++ b/src/gui2/Theme.cpp
@@ -24,7 +24,7 @@ using namespace gui;
 Theme::Theme()
 {
    normal_font_ = ft::load_font("data/fonts/Vera.ttf",
-      15, ft::FONT_MONO);
+      15, ft::FONT_NORMAL);
 }
       
 Colour Theme::background() const
-- 
2.39.2