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

LibGUI+LibGfx: Defer to fonts when setting Editor line height

Browse source 
Fonts now provide their preferred line height based on maximum
height and requested line gap. TTFs provide a preferred line gap
from table metrics while BitmapFonts are hardcoded at the previous
default for now.
This commit is contained in:
thankyouverycool 2022-02-24 08:52:31 -05:00 • committed by Andreas Kling
parent 07910c12e3
commit d94db1900e
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ public:
}
u8 glyph_height() const override { return m_glyph_height; }
int x_height() const override { return m_x_height; }
int preferred_line_height() const override { return glyph_height() + m_line_gap; }
u8 glyph_width(u32 code_point) const override;
u8 raw_glyph_width(u32 code_point) const { return m_glyph_widths[code_point]; }
@ -143,6 +144,7 @@ private:
u8 m_presentation_size { 0 };
u16 m_weight { 0 };
u8 m_slope { 0 };
u8 m_line_gap { 4 };
bool m_fixed_width { false };
bool m_owns_arrays { false };

1
Userland/Libraries/LibGfx/Font.h
View file

@ -111,6 +111,7 @@ public:
virtual int glyph_or_emoji_width(u32 code_point) const = 0;
virtual u8 glyph_height() const = 0;
virtual int x_height() const = 0;
virtual int preferred_line_height() const = 0;
virtual u8 min_glyph_width() const = 0;
virtual u8 max_glyph_width() const = 0;

1
Userland/Libraries/LibGfx/TrueTypeFont/Font.h
View file

@ -129,6 +129,7 @@ public:
virtual bool contains_glyph(u32 code_point) const override { return m_font->glyph_id_for_code_point(code_point) > 0; }
virtual u8 glyph_width(u32 code_point) const override;
virtual int glyph_or_emoji_width(u32 code_point) const override;
virtual int preferred_line_height() const override { return metrics().height() + metrics().line_gap; }
virtual u8 glyph_height() const override { return m_point_height; }
virtual int x_height() const override { return m_point_height; } // FIXME: Read from font
virtual u8 min_glyph_width() const override { return 1; } // FIXME: Read from font