LibGfx: Remove various unused Font APIs

This commit is contained in:
Andreas Kling 2024-06-04 15:38:47 +02:00
parent 23bb449026
commit eccfdede10
Notes: sideshowbarker 2024-07-18 00:34:07 +09:00
3 changed files with 1 additions and 42 deletions

View File

@ -172,35 +172,21 @@ public:
virtual float glyph_left_bearing(u32 code_point) const = 0; virtual float glyph_left_bearing(u32 code_point) const = 0;
virtual float glyph_width(u32 code_point) const = 0; virtual float glyph_width(u32 code_point) const = 0;
virtual float glyph_or_emoji_width(Utf8CodePointIterator&) const = 0; virtual float glyph_or_emoji_width(Utf8CodePointIterator&) const = 0;
virtual float glyph_or_emoji_width(Utf32CodePointIterator&) const = 0;
virtual float glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_point) const = 0; virtual float glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_point) const = 0;
virtual int x_height() const = 0; virtual int x_height() const = 0;
virtual float preferred_line_height() const = 0; virtual float preferred_line_height() const = 0;
virtual u8 min_glyph_width() const = 0;
virtual u8 max_glyph_width() const = 0;
virtual u8 glyph_fixed_width() const = 0;
virtual u8 baseline() const = 0; virtual u8 baseline() const = 0;
virtual u8 mean_line() const = 0;
virtual float width(StringView) const = 0; virtual float width(StringView) const = 0;
virtual float width(Utf8View const&) const = 0; virtual float width(Utf8View const&) const = 0;
virtual float width(Utf32View const&) const = 0;
virtual int width_rounded_up(StringView) const = 0;
virtual String name() const = 0; virtual String name() const = 0;
virtual bool is_fixed_width() const = 0;
virtual size_t glyph_count() const = 0;
virtual String family() const = 0; virtual String family() const = 0;
virtual String variant() const = 0; virtual String variant() const = 0;
virtual String qualified_name() const = 0; virtual String qualified_name() const = 0;
virtual String human_readable_name() const = 0;
virtual NonnullRefPtr<Font> with_size(float point_size) const = 0; virtual NonnullRefPtr<Font> with_size(float point_size) const = 0;

View File

@ -4,7 +4,6 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Utf32View.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <LibGfx/Font/Emoji.h> #include <LibGfx/Font/Emoji.h>
#include <LibGfx/Font/ScaledFont.h> #include <LibGfx/Font/ScaledFont.h>
@ -35,14 +34,8 @@ ScaledFont::ScaledFont(NonnullRefPtr<VectorFont> font, float point_width, float
}; };
} }
int ScaledFont::width_rounded_up(StringView view) const
{
return static_cast<int>(ceilf(width(view)));
}
float ScaledFont::width(StringView view) const { return unicode_view_width(Utf8View(view)); } float ScaledFont::width(StringView view) const { return unicode_view_width(Utf8View(view)); }
float ScaledFont::width(Utf8View const& view) const { return unicode_view_width(view); } float ScaledFont::width(Utf8View const& view) const { return unicode_view_width(view); }
float ScaledFont::width(Utf32View const& view) const { return unicode_view_width(view); }
template<typename T> template<typename T>
ALWAYS_INLINE float ScaledFont::unicode_view_width(T const& view) const ALWAYS_INLINE float ScaledFont::unicode_view_width(T const& view) const
@ -128,11 +121,6 @@ float ScaledFont::glyph_or_emoji_width(Utf8CodePointIterator& it) const
return glyph_or_emoji_width_impl(*this, it); return glyph_or_emoji_width_impl(*this, it);
} }
float ScaledFont::glyph_or_emoji_width(Utf32CodePointIterator& it) const
{
return glyph_or_emoji_width_impl(*this, it);
}
float ScaledFont::glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_point) const float ScaledFont::glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_point) const
{ {
if (left_code_point == 0 || right_code_point == 0) if (left_code_point == 0 || right_code_point == 0)
@ -146,11 +134,6 @@ float ScaledFont::glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_
return m_font->glyphs_horizontal_kerning(left_glyph_id, right_glyph_id, m_x_scale); return m_font->glyphs_horizontal_kerning(left_glyph_id, right_glyph_id, m_x_scale);
} }
u8 ScaledFont::glyph_fixed_width() const
{
return glyph_metrics(glyph_id_for_code_point(' ')).advance_width;
}
NonnullRefPtr<ScaledFont> ScaledFont::scaled_with_size(float point_size) const NonnullRefPtr<ScaledFont> ScaledFont::scaled_with_size(float point_size) const
{ {
if (point_size == m_point_height && point_size == m_point_width) if (point_size == m_point_height && point_size == m_point_width)

View File

@ -47,26 +47,16 @@ public:
virtual bool contains_glyph(u32 code_point) const override { return m_font->glyph_id_for_code_point(code_point) > 0; } virtual bool contains_glyph(u32 code_point) const override { return m_font->glyph_id_for_code_point(code_point) > 0; }
virtual float glyph_width(u32 code_point) const override; virtual float glyph_width(u32 code_point) const override;
virtual float glyph_or_emoji_width(Utf8CodePointIterator&) const override; virtual float glyph_or_emoji_width(Utf8CodePointIterator&) const override;
virtual float glyph_or_emoji_width(Utf32CodePointIterator&) const override;
virtual float glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_point) const override; virtual float glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_point) const override;
virtual float preferred_line_height() const override { return metrics().height() + metrics().line_gap; } virtual float preferred_line_height() const override { return metrics().height() + metrics().line_gap; }
virtual int x_height() const override { return m_point_height; } // FIXME: Read from font 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
virtual u8 max_glyph_width() const override { return m_point_width; } // FIXME: Read from font
virtual u8 glyph_fixed_width() const override;
virtual u8 baseline() const override { return m_point_height; } // FIXME: Read from font virtual u8 baseline() const override { return m_point_height; } // FIXME: Read from font
virtual u8 mean_line() const override { return m_point_height; } // FIXME: Read from font
virtual float width(StringView) const override; virtual float width(StringView) const override;
virtual float width(Utf8View const&) const override; virtual float width(Utf8View const&) const override;
virtual float width(Utf32View const&) const override;
virtual int width_rounded_up(StringView) const override;
virtual String name() const override { return MUST(String::formatted("{} {}", family(), variant())); } virtual String name() const override { return MUST(String::formatted("{} {}", family(), variant())); }
virtual bool is_fixed_width() const override { return m_font->is_fixed_width(); }
virtual size_t glyph_count() const override { return m_font->glyph_count(); }
virtual String family() const override { return m_font->family(); } virtual String family() const override { return m_font->family(); }
virtual String variant() const override { return m_font->variant(); } virtual String variant() const override { return m_font->variant(); }
virtual String qualified_name() const override { return MUST(String::formatted("{} {} {} {}", family(), presentation_size(), weight(), slope())); } virtual String qualified_name() const override { return MUST(String::formatted("{} {} {} {}", family(), presentation_size(), weight(), slope())); }
virtual String human_readable_name() const override { return MUST(String::formatted("{} {} {}", family(), variant(), presentation_size())); }
virtual NonnullRefPtr<ScaledFont> scaled_with_size(float point_size) const; virtual NonnullRefPtr<ScaledFont> scaled_with_size(float point_size) const;
virtual NonnullRefPtr<Font> with_size(float point_size) const override; virtual NonnullRefPtr<Font> with_size(float point_size) const override;