RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:37:43 +00:00
Code Issues Activity Actions

LibTTF: Port width calculation changes from BitmapFont

Browse source
This commit is contained in:
LuK1337 2021-07-11 01:05:36 +02:00 • committed by Andreas Kling
parent c0f9adabd6
commit 99013ac3d5
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Userland/Libraries/LibTTF/Font.cpp
View file

@ -488,32 +488,29 @@ bool Font::is_fixed_width() const
return glyph_metrics(glyph_id_for_code_point('.'), 1, 1).advance_width == glyph_metrics(glyph_id_for_code_point('X'), 1, 1).advance_width; return glyph_metrics(glyph_id_for_code_point('.'), 1, 1).advance_width == glyph_metrics(glyph_id_for_code_point('X'), 1, 1).advance_width;
} }
int ScaledFont::width(const StringView& string) const int ScaledFont::width(StringView const& view) const { return unicode_view_width(Utf8View(view)); }
{ int ScaledFont::width(Utf8View const& view) const { return unicode_view_width(view); }
Utf8View utf8 { string }; int ScaledFont::width(Utf32View const& view) const { return unicode_view_width(view); }
return width(utf8);
}
int ScaledFont::width(const Utf8View& utf8) const template<typename T>
ALWAYS_INLINE int ScaledFont::unicode_view_width(T const& view) const
{ {
if (view.is_empty())
return 0;
int width = 0; int width = 0;
for (u32 code_point : utf8) { int longest_width = 0;
for (auto code_point : view) {
if (code_point == '\n' || code_point == '\r') {
longest_width = max(width, longest_width);
width = 0;
continue;
}
u32 glyph_id = glyph_id_for_code_point(code_point); u32 glyph_id = glyph_id_for_code_point(code_point);
auto metrics = glyph_metrics(glyph_id); auto metrics = glyph_metrics(glyph_id);
width += metrics.advance_width; width += metrics.advance_width;
} }
return width; longest_width = max(width, longest_width);
} return longest_width;
int ScaledFont::width(const Utf32View& utf32) const
{
int width = 0;
for (size_t i = 0; i < utf32.length(); i++) {
u32 glyph_id = glyph_id_for_code_point(utf32.code_points()[i]);
auto metrics = glyph_metrics(glyph_id);
width += metrics.advance_width;
}
return width;
} }
RefPtr<Gfx::Bitmap> ScaledFont::raster_glyph(u32 glyph_id) const RefPtr<Gfx::Bitmap> ScaledFont::raster_glyph(u32 glyph_id) const

3
Userland/Libraries/LibTTF/Font.h
View file

@ -151,6 +151,9 @@ 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<u32, RefPtr<Gfx::Bitmap>> m_cached_glyph_bitmaps; mutable HashMap<u32, RefPtr<Gfx::Bitmap>> m_cached_glyph_bitmaps;
template<typename T>
int unicode_view_width(T const& view) const;
}; };
} }