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

LibGfx: Introduce with_size method for Font

Browse source
This commit is contained in:
Aliaksandr Kalenik 2023-02-09 11:55:05 +03:00 • committed by Linus Groh
parent d910dd345e
commit 1cc8895e4b
5 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibGfx/Font/BitmapFont.cpp
View file

@ -381,6 +381,11 @@ DeprecatedString BitmapFont::variant() const
return builder.to_deprecated_string(); return builder.to_deprecated_string();
} }
RefPtr<Font> BitmapFont::with_size(float point_size) const
{
return Gfx::FontDatabase::the().get(family(), point_size, weight(), width(), slope());
}
Font const& Font::bold_variant() const Font const& Font::bold_variant() const
{ {
if (m_bold_variant) if (m_bold_variant)

2
Userland/Libraries/LibGfx/Font/BitmapFont.h
View file

@ -125,6 +125,8 @@ public:
DeprecatedString qualified_name() const override; DeprecatedString qualified_name() const override;
DeprecatedString human_readable_name() const override { return DeprecatedString::formatted("{} {} {}", family(), variant(), presentation_size()); } DeprecatedString human_readable_name() const override { return DeprecatedString::formatted("{} {} {}", family(), variant(), presentation_size()); }
virtual RefPtr<Font> with_size(float point_size) const override;
private: private:
BitmapFont(DeprecatedString name, DeprecatedString family, u8* rows, u8* widths, bool is_fixed_width, BitmapFont(DeprecatedString name, DeprecatedString family, u8* rows, u8* widths, bool is_fixed_width,
u8 glyph_width, u8 glyph_height, u8 glyph_spacing, u16 range_mask_size, u8* range_mask, u8 glyph_width, u8 glyph_height, u8 glyph_spacing, u16 range_mask_size, u8* range_mask,

2
Userland/Libraries/LibGfx/Font/Font.h
View file

@ -197,6 +197,8 @@ public:
virtual DeprecatedString qualified_name() const = 0; virtual DeprecatedString qualified_name() const = 0;
virtual DeprecatedString human_readable_name() const = 0; virtual DeprecatedString human_readable_name() const = 0;
virtual RefPtr<Font> with_size(float point_size) const = 0;
Font const& bold_variant() const; Font const& bold_variant() const;
private: private:

5
Userland/Libraries/LibGfx/Font/ScaledFont.cpp
View file

@ -123,6 +123,11 @@ u8 ScaledFont::glyph_fixed_width() const
return glyph_metrics(glyph_id_for_code_point(' ')).advance_width; return glyph_metrics(glyph_id_for_code_point(' ')).advance_width;
} }
RefPtr<Font> ScaledFont::with_size(float point_size) const
{
return adopt_ref(*new Gfx::ScaledFont(*m_font, point_size, point_size));
}
Gfx::FontPixelMetrics ScaledFont::pixel_metrics() const Gfx::FontPixelMetrics ScaledFont::pixel_metrics() const
{ {
return m_pixel_metrics; return m_pixel_metrics;

2
Userland/Libraries/LibGfx/Font/ScaledFont.h
View file

@ -67,6 +67,8 @@ public:
virtual DeprecatedString qualified_name() const override { return DeprecatedString::formatted("{} {} {} {}", family(), presentation_size(), weight(), slope()); } virtual DeprecatedString qualified_name() const override { return DeprecatedString::formatted("{} {} {} {}", family(), presentation_size(), weight(), slope()); }
virtual DeprecatedString human_readable_name() const override { return DeprecatedString::formatted("{} {} {}", family(), variant(), presentation_size()); } virtual DeprecatedString human_readable_name() const override { return DeprecatedString::formatted("{} {} {}", family(), variant(), presentation_size()); }
virtual RefPtr<Font> with_size(float point_size) const override;
private: private:
NonnullRefPtr<VectorFont> m_font; NonnullRefPtr<VectorFont> m_font;
float m_x_scale { 0.0f }; float m_x_scale { 0.0f };