From 397269d21e363c59f0b661d749e515838fc1846d Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Sun, 18 Apr 2021 21:18:58 +0300 Subject: [PATCH] LibGfx: Report font glyph presence based on glyph's specific width This uses the per glyph width to determine if the glyph is actually present in the font, and not just inside the range the font can covers This means that characters that are in the font's range but that are missing a glyph will show up as the missing character glyph instead of being invisible. --- Userland/Libraries/LibGfx/BitmapFont.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Userland/Libraries/LibGfx/BitmapFont.h b/Userland/Libraries/LibGfx/BitmapFont.h index 67f7354e9c..38a078a8e8 100644 --- a/Userland/Libraries/LibGfx/BitmapFont.h +++ b/Userland/Libraries/LibGfx/BitmapFont.h @@ -63,7 +63,7 @@ public: void set_weight(u16 weight) { m_weight = weight; } Glyph glyph(u32 code_point) const; - bool contains_glyph(u32 code_point) const { return code_point < (u32)glyph_count(); } + 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;