RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 04:17:34 +00:00
Code Issues Activity Actions

LibGfx: Convert Font APIs to return String instead of DeprecatedString

Browse source
This commit is contained in:
Andreas Kling 2023-09-05 15:32:52 +02:00 • committed by Tim Flynn
parent 4e9dc127ae
commit 545d8336b8
29 changed files with 106 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/FontCache.cpp
View file

@ -21,7 +21,7 @@ RefPtr<Gfx::Font const> FontCache::get(FontSelector const& font_selector) const
NonnullRefPtr<Gfx::Font const> FontCache::scaled_font(Gfx::Font const& font, float scale_factor)
{
auto device_font_pt_size = font.point_size() * scale_factor;
FontSelector font_selector = { FlyString::from_deprecated_fly_string(font.family()).release_value_but_fixme_should_propagate_errors(), device_font_pt_size, font.weight(), font.width(), font.slope() };
FontSelector font_selector = { font.family(), device_font_pt_size, font.weight(), font.width(), font.slope() };
if (auto cached_font = get(font_selector)) {
return *cached_font;
}

4
Userland/Libraries/LibWeb/Platform/FontPluginSerenity.cpp
View file

@ -37,10 +37,10 @@ DeprecatedString FontPluginSerenity::generic_font_name(GenericFont generic_font)
case GenericFont::UiSansSerif:
case GenericFont::Cursive:
case GenericFont::UiRounded:
return default_font().family();
return default_font().family().to_deprecated_string();
case GenericFont::Monospace:
case GenericFont::UiMonospace:
return default_fixed_width_font().family();
return default_fixed_width_font().family().to_deprecated_string();
case GenericFont::Serif:
case GenericFont::UiSerif:
return "Roman";