RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:07:45 +00:00
Code Issues Activity Actions

Userland+Tests: Remove uses of direct file loading for BitmapFont

Browse source 
Route them through Core::Resource APIs instead.
This commit is contained in:
Andrew Kaster 2023-10-17 12:45:22 -06:00 • committed by Andrew Kaster
parent d587bd0a04
commit 1567332e34
6 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGfx/Font/FontDatabase.cpp
View file

@ -122,7 +122,7 @@ void FontDatabase::load_all_fonts_from_uri(StringView uri)
auto path_string = resource.filesystem_path().release_value();
auto path = LexicalPath(path_string.bytes_as_string_view());
if (path.has_extension(".font"sv)) {
if (auto font_or_error = Gfx::BitmapFont::try_load_from_file(path.string()); !font_or_error.is_error()) {
if (auto font_or_error = Gfx::BitmapFont::try_load_from_resource(resource); !font_or_error.is_error()) {
auto font = font_or_error.release_value();
m_private->full_name_to_font_map.set(font->qualified_name().to_deprecated_string(), *font);
auto typeface = get_or_create_typeface(font->family(), font->variant());