diff --git a/Userland/Libraries/LibGfx/Font/FontDatabase.cpp b/Userland/Libraries/LibGfx/Font/FontDatabase.cpp index 0eca6f7572..6fb24f7c1d 100644 --- a/Userland/Libraries/LibGfx/Font/FontDatabase.cpp +++ b/Userland/Libraries/LibGfx/Font/FontDatabase.cpp @@ -113,7 +113,7 @@ FontDatabase::FontDatabase() if (auto font_or_error = TTF::Font::try_load_from_file(path); !font_or_error.is_error()) { auto font = font_or_error.release_value(); auto typeface = get_or_create_typeface(font->family(), font->variant()); - typeface->set_ttf_font(move(font)); + typeface->set_vector_font(move(font)); } } } diff --git a/Userland/Libraries/LibGfx/Font/Typeface.cpp b/Userland/Libraries/LibGfx/Font/Typeface.cpp index a65dd311c1..44a675dcac 100644 --- a/Userland/Libraries/LibGfx/Font/Typeface.cpp +++ b/Userland/Libraries/LibGfx/Font/Typeface.cpp @@ -11,32 +11,32 @@ namespace Gfx { unsigned Typeface::weight() const { - VERIFY(m_ttf_font || m_bitmap_fonts.size() > 0); + VERIFY(m_vector_font || m_bitmap_fonts.size() > 0); if (is_fixed_size()) return m_bitmap_fonts[0]->weight(); - return m_ttf_font->weight(); + return m_vector_font->weight(); } u8 Typeface::slope() const { - VERIFY(m_ttf_font || m_bitmap_fonts.size() > 0); + VERIFY(m_vector_font || m_bitmap_fonts.size() > 0); if (is_fixed_size()) return m_bitmap_fonts[0]->slope(); - return m_ttf_font->slope(); + return m_vector_font->slope(); } bool Typeface::is_fixed_width() const { - VERIFY(m_ttf_font || m_bitmap_fonts.size() > 0); + VERIFY(m_vector_font || m_bitmap_fonts.size() > 0); if (is_fixed_size()) return m_bitmap_fonts[0]->is_fixed_width(); - return m_ttf_font->is_fixed_width(); + return m_vector_font->is_fixed_width(); } void Typeface::add_bitmap_font(RefPtr font) @@ -44,17 +44,17 @@ void Typeface::add_bitmap_font(RefPtr font) m_bitmap_fonts.append(font); } -void Typeface::set_ttf_font(RefPtr font) +void Typeface::set_vector_font(RefPtr font) { - m_ttf_font = move(font); + m_vector_font = move(font); } RefPtr Typeface::get_font(float point_size, Font::AllowInexactSizeMatch allow_inexact_size_match) const { VERIFY(point_size > 0); - if (m_ttf_font) - return adopt_ref(*new Gfx::ScaledFont(*m_ttf_font, point_size, point_size)); + if (m_vector_font) + return adopt_ref(*new Gfx::ScaledFont(*m_vector_font, point_size, point_size)); RefPtr best_match; int size = roundf(point_size); diff --git a/Userland/Libraries/LibGfx/Font/Typeface.h b/Userland/Libraries/LibGfx/Font/Typeface.h index 5966366b76..a11eff673b 100644 --- a/Userland/Libraries/LibGfx/Font/Typeface.h +++ b/Userland/Libraries/LibGfx/Font/Typeface.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace Gfx { @@ -34,7 +34,7 @@ public: void for_each_fixed_size_font(Function) const; void add_bitmap_font(RefPtr); - void set_ttf_font(RefPtr); + void set_vector_font(RefPtr); RefPtr get_font(float point_size, Font::AllowInexactSizeMatch = Font::AllowInexactSizeMatch::No) const; @@ -43,7 +43,7 @@ private: FlyString m_variant; Vector> m_bitmap_fonts; - RefPtr m_ttf_font; + RefPtr m_vector_font; }; }