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

Make a preparation pass for variable-width fonts.

Browse source
This commit is contained in:
Andreas Kling 2019-03-06 11:03:10 +01:00
parent b85fe0bd07
commit 0a86366c71
9 changed files with 72 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
SharedGraphics/Font.h
View file

@ -54,21 +54,30 @@ public:
GlyphBitmap glyph_bitmap(char ch) const { return GlyphBitmap(&m_rows[(byte)ch * m_glyph_height], { m_glyph_width, m_glyph_height }); }
byte glyph_width() const { return m_glyph_width; }
byte glyph_width(char ch) const { return m_fixed_width ? m_glyph_width : m_glyph_widths[(byte)ch]; }
byte glyph_height() const { return m_glyph_height; }
int width(const String& string) const { return string.length() * glyph_width(); }
byte min_glyph_width() const { return m_min_glyph_width; }
byte max_glyph_width() const { return m_max_glyph_width; }
int width(const String& string) const;
String name() const { return m_name; }
void set_name(const String& name) { m_name = name; }
bool is_fixed_width() const { return m_fixed_width; }
private:
Font(const String& name, unsigned* rows, byte glyph_width, byte glyph_height);
String m_name;
unsigned* m_rows { nullptr };
byte* m_glyph_widths { nullptr };
void* m_mmap_ptr { nullptr };
byte m_glyph_width { 0 };
byte m_glyph_height { 0 };
byte m_min_glyph_width { 0 };
byte m_max_glyph_width { 0 };
bool m_fixed_width { false };
};