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

LibGfx: Cache font pixel metrics in ScaledFont

Browse source 
Instead of recomputing the pixel metrics over and over, we can just
cache them with the font and avoid a bunch of expensive computation.
This commit is contained in:
Andreas Kling 2023-01-16 09:26:01 +01:00
parent 83488cd102
commit 850b4a03e6
2 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,28 @@
namespace Gfx { namespace Gfx {
ScaledFont::ScaledFont(NonnullRefPtr<VectorFont> font, float point_width, float point_height, unsigned dpi_x, unsigned dpi_y)
: m_font(move(font))
, m_point_width(point_width)
, m_point_height(point_height)
{
float units_per_em = m_font->units_per_em();
m_x_scale = (point_width * dpi_x) / (POINTS_PER_INCH * units_per_em);
m_y_scale = (point_height * dpi_y) / (POINTS_PER_INCH * units_per_em);
auto metrics = m_font->metrics(m_x_scale, m_y_scale);
m_pixel_metrics = Gfx::FontPixelMetrics {
.size = (float)pixel_size(),
.x_height = (float)x_height(),
.advance_of_ascii_zero = (float)glyph_width('0'),
.glyph_spacing = (float)glyph_spacing(),
.ascent = metrics.ascender,
.descent = metrics.descender,
.line_gap = metrics.line_gap,
};
}
float ScaledFont::width(StringView view) const { return unicode_view_width(Utf8View(view)); } float ScaledFont::width(StringView view) const { return unicode_view_width(Utf8View(view)); }
float ScaledFont::width(Utf8View const& view) const { return unicode_view_width(view); } float ScaledFont::width(Utf8View const& view) const { return unicode_view_width(view); }
float ScaledFont::width(Utf32View const& view) const { return unicode_view_width(view); } float ScaledFont::width(Utf32View const& view) const { return unicode_view_width(view); }
@ -103,17 +125,7 @@ u8 ScaledFont::glyph_fixed_width() const
Gfx::FontPixelMetrics ScaledFont::pixel_metrics() const Gfx::FontPixelMetrics ScaledFont::pixel_metrics() const
{ {
auto metrics = m_font->metrics(m_x_scale, m_y_scale); return m_pixel_metrics;
return Gfx::FontPixelMetrics {
.size = (float)pixel_size(),
.x_height = (float)x_height(),
.advance_of_ascii_zero = (float)glyph_width('0'),
.glyph_spacing = (float)glyph_spacing(),
.ascent = metrics.ascender,
.descent = metrics.descender,
.line_gap = metrics.line_gap,
};
} }
} }

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

@ -23,17 +23,9 @@ struct GlyphIndexWithSubpixelOffset {
bool operator==(GlyphIndexWithSubpixelOffset const&) const = default; bool operator==(GlyphIndexWithSubpixelOffset const&) const = default;
}; };
class ScaledFont : public Gfx::Font { class ScaledFont final : public Gfx::Font {
public: public:
ScaledFont(NonnullRefPtr<VectorFont> font, float point_width, float point_height, unsigned dpi_x = DEFAULT_DPI, unsigned dpi_y = DEFAULT_DPI) ScaledFont(NonnullRefPtr<VectorFont>, float point_width, float point_height, unsigned dpi_x = DEFAULT_DPI, unsigned dpi_y = DEFAULT_DPI);
: m_font(move(font))
, m_point_width(point_width)
, m_point_height(point_height)
{
float units_per_em = m_font->units_per_em();
m_x_scale = (point_width * dpi_x) / (POINTS_PER_INCH * units_per_em);
m_y_scale = (point_height * dpi_y) / (POINTS_PER_INCH * units_per_em);
}
u32 glyph_id_for_code_point(u32 code_point) const { return m_font->glyph_id_for_code_point(code_point); } u32 glyph_id_for_code_point(u32 code_point) const { return m_font->glyph_id_for_code_point(code_point); }
ScaledFontMetrics metrics() const { return m_font->metrics(m_x_scale, m_y_scale); } ScaledFontMetrics metrics() const { return m_font->metrics(m_x_scale, m_y_scale); }
ScaledGlyphMetrics glyph_metrics(u32 glyph_id) const { return m_font->glyph_metrics(glyph_id, m_x_scale, m_y_scale); } ScaledGlyphMetrics glyph_metrics(u32 glyph_id) const { return m_font->glyph_metrics(glyph_id, m_x_scale, m_y_scale); }
@ -81,6 +73,7 @@ private:
float m_point_width { 0.0f }; float m_point_width { 0.0f };
float m_point_height { 0.0f }; float m_point_height { 0.0f };
mutable HashMap<GlyphIndexWithSubpixelOffset, RefPtr<Gfx::Bitmap>> m_cached_glyph_bitmaps; mutable HashMap<GlyphIndexWithSubpixelOffset, RefPtr<Gfx::Bitmap>> m_cached_glyph_bitmaps;
Gfx::FontPixelMetrics m_pixel_metrics;
template<typename T> template<typename T>
float unicode_view_width(T const& view) const; float unicode_view_width(T const& view) const;