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

LibGfx: Add Font::point_size()

Browse source 
This returns the font size in pt instead of px.
This commit is contained in:
Andreas Kling 2023-03-15 10:46:06 +01:00
parent db545b51ef
commit a4927f523b
4 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,8 @@ public:
u8* rows() { return m_rows; } u8* rows() { return m_rows; }
u8* widths() { return m_glyph_widths; } u8* widths() { return m_glyph_widths; }
virtual float point_size() const override { return m_presentation_size; }
u8 presentation_size() const override { return m_presentation_size; } u8 presentation_size() const override { return m_presentation_size; }
void set_presentation_size(u8 size) { m_presentation_size = size; } void set_presentation_size(u8 size) { m_presentation_size = size; }

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

@ -161,6 +161,9 @@ public:
virtual u8 presentation_size() const = 0; virtual u8 presentation_size() const = 0;
virtual u8 slope() const = 0; virtual u8 slope() const = 0;
// Font point size (distance between ascender and descender).
virtual float point_size() const = 0;
// Font pixel size (distance between ascender and descender). // Font pixel size (distance between ascender and descender).
virtual float pixel_size() const = 0; virtual float pixel_size() const = 0;

5
Userland/Libraries/LibGfx/Font/ScaledFont.cpp
View file

@ -163,4 +163,9 @@ int ScaledFont::pixel_size_rounded_up() const
return m_pixel_size_rounded_up; return m_pixel_size_rounded_up;
} }
float ScaledFont::point_size() const
{
return m_point_height;
}
} }

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

@ -36,6 +36,7 @@ public:
virtual NonnullRefPtr<Font> clone() const override { return MUST(try_clone()); } // FIXME: clone() should not need to be implemented virtual NonnullRefPtr<Font> clone() const override { return MUST(try_clone()); } // FIXME: clone() should not need to be implemented
virtual ErrorOr<NonnullRefPtr<Font>> try_clone() const override { return const_cast<ScaledFont&>(*this); } virtual ErrorOr<NonnullRefPtr<Font>> try_clone() const override { return const_cast<ScaledFont&>(*this); }
virtual u8 presentation_size() const override { return m_point_height; } virtual u8 presentation_size() const override { return m_point_height; }
virtual float point_size() const override;
virtual float pixel_size() const override; virtual float pixel_size() const override;
virtual int pixel_size_rounded_up() const override; virtual int pixel_size_rounded_up() const override;
virtual Gfx::FontPixelMetrics pixel_metrics() const override; virtual Gfx::FontPixelMetrics pixel_metrics() const override;