From eccfdede10c8f72dbb3e16736b4606325f809cfe Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 4 Jun 2024 15:38:47 +0200 Subject: [PATCH] LibGfx: Remove various unused Font APIs --- Userland/Libraries/LibGfx/Font/Font.h | 14 -------------- Userland/Libraries/LibGfx/Font/ScaledFont.cpp | 17 ----------------- Userland/Libraries/LibGfx/Font/ScaledFont.h | 12 +----------- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/Userland/Libraries/LibGfx/Font/Font.h b/Userland/Libraries/LibGfx/Font/Font.h index f2ed618925..e76d9d1579 100644 --- a/Userland/Libraries/LibGfx/Font/Font.h +++ b/Userland/Libraries/LibGfx/Font/Font.h @@ -172,35 +172,21 @@ public: virtual float glyph_left_bearing(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(Utf32CodePointIterator&) const = 0; virtual float glyphs_horizontal_kerning(u32 left_code_point, u32 right_code_point) const = 0; virtual int x_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 mean_line() const = 0; virtual float width(StringView) 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 bool is_fixed_width() const = 0; - - virtual size_t glyph_count() const = 0; - virtual String family() const = 0; virtual String variant() const = 0; virtual String qualified_name() const = 0; - virtual String human_readable_name() const = 0; virtual NonnullRefPtr with_size(float point_size) const = 0; diff --git a/Userland/Libraries/LibGfx/Font/ScaledFont.cpp b/Userland/Libraries/LibGfx/Font/ScaledFont.cpp index 81e3e24051..855f3edf95 100644 --- a/Userland/Libraries/LibGfx/Font/ScaledFont.cpp +++ b/Userland/Libraries/LibGfx/Font/ScaledFont.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include #include #include @@ -35,14 +34,8 @@ ScaledFont::ScaledFont(NonnullRefPtr font, float point_width, float }; } -int ScaledFont::width_rounded_up(StringView view) const -{ - return static_cast(ceilf(width(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(Utf32View const& view) const { return unicode_view_width(view); } template 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); } -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 { 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); } -u8 ScaledFont::glyph_fixed_width() const -{ - return glyph_metrics(glyph_id_for_code_point(' ')).advance_width; -} - NonnullRefPtr ScaledFont::scaled_with_size(float point_size) const { if (point_size == m_point_height && point_size == m_point_width) diff --git a/Userland/Libraries/LibGfx/Font/ScaledFont.h b/Userland/Libraries/LibGfx/Font/ScaledFont.h index b895921ba5..20c9987341 100644 --- a/Userland/Libraries/LibGfx/Font/ScaledFont.h +++ b/Userland/Libraries/LibGfx/Font/ScaledFont.h @@ -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 float glyph_width(u32 code_point) 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 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 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 int x_height() 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(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 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 variant() const override { return m_font->variant(); } 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 scaled_with_size(float point_size) const; virtual NonnullRefPtr with_size(float point_size) const override;