RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 16:47:41 +00:00
Code Issues Activity Actions

LibGfx: Try to get TTF font when query is not in name->font map

Browse source 
This change allows us to select TTF fonts in display settings again :^)
This commit is contained in:
LuK1337 2021-07-11 00:06:13 +02:00 • committed by Andreas Kling
parent c03353e7ca
commit c0f9adabd6
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,6 +140,13 @@ RefPtr<Gfx::Font> FontDatabase::get_by_name(const StringView& name)
{ {
auto it = m_private->full_name_to_font_map.find(name); auto it = m_private->full_name_to_font_map.find(name);
if (it == m_private->full_name_to_font_map.end()) { if (it == m_private->full_name_to_font_map.end()) {
auto parts = name.split_view(" "sv);
if (parts.size() >= 3) {
auto weight = parts.take_last().to_int().value_or(0);
auto size = parts.take_last().to_int().value_or(0);
auto family = String::join(' ', parts);
return get(family, size, weight);
}
dbgln("Font lookup failed: '{}'", name); dbgln("Font lookup failed: '{}'", name);
return nullptr; return nullptr;
} }
@ -152,6 +159,7 @@ RefPtr<Gfx::Font> FontDatabase::get(const String& family, unsigned size, unsigne
if (typeface->family() == family && typeface->weight() == weight) if (typeface->family() == family && typeface->weight() == weight)
return typeface->get_font(size); return typeface->get_font(size);
} }
dbgln("Failed to get font: '{} {} {}'", family, size, weight);
return nullptr; return nullptr;
} }