More work on the variable-width font support.

Katica is now the default system font, and it looks quite nice. :^)
I'm gonna need to refine the GTextBox movement stuff eventually,
but it works well-enough for basic editing now.

1 files changed, 19 insertions, 6 deletions

diff --git a/LibGUI/GFontDatabase.cpp b/LibGUI/GFontDatabase.cpp
index a07d21ddd1..63c8f7ec4d 100644
--- a/LibGUI/GFontDatabase.cpp
+++ b/LibGUI/GFontDatabase.cpp
@@ -24,8 +24,13 @@ GFontDatabase::GFontDatabase()
         if (de->d_name[0] == '.')
             continue;
         auto path = String::format("/res/fonts/%s", de->d_name);
-        if (auto font = Font::load_from_file(path))
-            m_name_to_path.set(font->name(), path);
+        if (auto font = Font::load_from_file(path)) {
+            Metadata metadata;
+            metadata.path = path;
+            metadata.glyph_height = font->glyph_height();
+            metadata.is_fixed_width = font->is_fixed_width();
+            m_name_to_metadata.set(font->name(), move(metadata));
+        }
     }
     closedir(dirp);
 }
@@ -36,15 +41,23 @@ GFontDatabase::~GFontDatabase()
 
 void GFontDatabase::for_each_font(Function<void(const String&)> callback)
 {
-    for (auto& it : m_name_to_path) {
+    for (auto& it : m_name_to_metadata) {
         callback(it.key);
     }
 }
 
+void GFontDatabase::for_each_fixed_width_font(Function<void(const String&)> callback)
+{
+    for (auto& it : m_name_to_metadata) {
+        if (it.value.is_fixed_width)
+            callback(it.key);
+    }
+}
+
 RetainPtr<Font> GFontDatabase::get_by_name(const String& name)
 {
-    auto it = m_name_to_path.find(name);
-    if (it == m_name_to_path.end())
+    auto it = m_name_to_metadata.find(name);
+    if (it == m_name_to_metadata.end())
         return nullptr;
-    return Font::load_from_file((*it).value);
+    return Font::load_from_file((*it).value.path);
 }