RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 09:42:45 +00:00
Code Issues Activity Actions

LibGfx: Insert pixel and ttf fonts into Typeface structure

Browse source 
This adds a new structure 'Typeface' to the FontDatabase that
represents all fonts of the same family and variant.
It can contain a list of BitmapFonts with varying size but of
the same family and weight or a pointer to a single TTF font
for all sizes of this Typeface.
This commit is contained in:
Stephan Unverwerth 2021-01-02 14:49:20 +01:00 • committed by Andreas Kling
parent 2c4e13f14a
commit 179dba652e
13 changed files with 248 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Libraries/LibGfx/FontDatabase.cpp
View file

@ -29,6 +29,8 @@
#include <LibCore/DirIterator.h>
#include <LibGfx/Font.h>
#include <LibGfx/FontDatabase.h>
#include <LibGfx/Typeface.h>
#include <LibTTF/Font.h>
#include <dirent.h>
#include <stdio.h>
#include <stdlib.h>
@ -86,6 +88,7 @@ Font& FontDatabase::default_bold_font()
struct FontDatabase::Private {
HashMap<String, RefPtr<Gfx::Font>> full_name_to_font_map;
Vector<RefPtr<Typeface>> typefaces;
};
FontDatabase::FontDatabase()
@ -98,12 +101,20 @@ FontDatabase::FontDatabase()
}
while (di.has_next()) {
String name = di.next_path();
if (!name.ends_with(".font"))
continue;
auto path = String::format("/res/fonts/%s", name.characters());
if (auto font = Gfx::Font::load_from_file(path)) {
m_private->full_name_to_font_map.set(font->qualified_name(), font);
if (name.ends_with(".font")) {
if (auto font = Gfx::Font::load_from_file(path)) {
m_private->full_name_to_font_map.set(font->qualified_name(), font);
auto typeface = get_or_create_typeface(font->family(), font->variant());
typeface->add_bitmap_font(font);
}
} else if (name.ends_with(".ttf")) {
// FIXME: What about .otf and .woff
if (auto font = TTF::Font::load_from_file(path)) {
auto typeface = get_or_create_typeface(font->family(), font->variant());
typeface->set_ttf_font(font);
}
}
}
}
@ -156,4 +167,15 @@ RefPtr<Gfx::Font> FontDatabase::get(const String& family, unsigned size, unsigne
return nullptr;
}
RefPtr<Typeface> FontDatabase::get_or_create_typeface(const String& family, const String& variant)
{
for (auto typeface : m_private->typefaces) {
if (typeface->family() == family && typeface->variant() == variant)
return typeface;
}
auto typeface = adopt(*new Typeface(family, variant));
m_private->typefaces.append(typeface);
return typeface;
}
}