mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibGfx: Inline BitmapFont::glyph_or_emoji_width() for fixed-width fonts

Browse source
This commit is contained in:
Andreas Kling 2021-06-14 11:20:39 +02:00
parent 6e0e8a8242
commit add3d6e9d7
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -242,7 +242,7 @@ Glyph BitmapFont::glyph(u32 code_point) const
m_glyph_height);
}
int BitmapFont::glyph_or_emoji_width(u32 code_point) const
int BitmapFont::glyph_or_emoji_width_for_variable_width_font(u32 code_point) const
{
if (code_point < m_glyph_count) {
if (m_glyph_widths[code_point] > 0)
@ -251,9 +251,6 @@ int BitmapFont::glyph_or_emoji_width(u32 code_point) const
return glyph_width('?');
}
if (m_fixed_width)
return m_glyph_width;
auto* emoji = Emoji::emoji_for_code_point(code_point);
if (emoji == nullptr)
return glyph_width('?');

8
Userland/Libraries/LibGfx/BitmapFont.h
View file

@ -46,7 +46,12 @@ public:
bool contains_glyph(u32 code_point) const { return code_point < (u32)glyph_count() && m_glyph_widths[code_point] > 0; }
u8 glyph_width(size_t ch) const { return m_fixed_width ? m_glyph_width : m_glyph_widths[ch]; }
int glyph_or_emoji_width(u32 code_point) const;
ALWAYS_INLINE int glyph_or_emoji_width(u32 code_point) const
{
if (m_fixed_width)
return m_glyph_width;
return glyph_or_emoji_width_for_variable_width_font(code_point);
}
u8 glyph_height() const { return m_glyph_height; }
int x_height() const { return m_x_height; }
@ -111,6 +116,7 @@ private:
static RefPtr<BitmapFont> load_from_memory(const u8*);
void update_x_height() { m_x_height = m_baseline - m_mean_line; };
int glyph_or_emoji_width_for_variable_width_font(u32 code_point) const;
String m_name;
String m_family;