diff --git a/Userland/Libraries/LibGfx/Font/Font.h b/Userland/Libraries/LibGfx/Font/Font.h index 8d7c81569e1..712724e47a9 100644 --- a/Userland/Libraries/LibGfx/Font/Font.h +++ b/Userland/Libraries/LibGfx/Font/Font.h @@ -77,7 +77,6 @@ public: virtual u32 glyph_id_for_code_point(u32 code_point) const = 0; virtual float glyph_width(u32 code_point) const = 0; - virtual float glyph_or_emoji_width(Utf8CodePointIterator&) const = 0; virtual int x_height() const = 0; virtual float preferred_line_height() const = 0; diff --git a/Userland/Libraries/LibGfx/Font/ScaledFont.cpp b/Userland/Libraries/LibGfx/Font/ScaledFont.cpp index e43c0cff668..737d92a0240 100644 --- a/Userland/Libraries/LibGfx/Font/ScaledFont.cpp +++ b/Userland/Libraries/LibGfx/Font/ScaledFont.cpp @@ -68,20 +68,6 @@ float ScaledFont::glyph_width(u32 code_point) const return measure_text_width(Utf8View(string), *this); } -template -static float glyph_or_emoji_width_impl(ScaledFont const& font, CodePointIterator& it) -{ - if (auto const* emoji = Emoji::emoji_for_code_point_iterator(it)) - return font.pixel_size() * emoji->width() / emoji->height(); - - return font.glyph_width(*it); -} - -float ScaledFont::glyph_or_emoji_width(Utf8CodePointIterator& it) const -{ - return glyph_or_emoji_width_impl(*this, it); -} - 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 01fb9788933..1d60ff035ab 100644 --- a/Userland/Libraries/LibGfx/Font/ScaledFont.h +++ b/Userland/Libraries/LibGfx/Font/ScaledFont.h @@ -30,7 +30,6 @@ public: virtual u16 weight() const override { return m_typeface->weight(); } virtual bool contains_glyph(u32 code_point) const override { return m_typeface->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 u32 glyph_id_for_code_point(u32 code_point) const override { return m_typeface->glyph_id_for_code_point(code_point); } 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