Ver Fonte

LibGfx: Remove Font::glyph_height() virtual

The override on BitmapFont remains, as that is actually used within
the FontEditor program.
Andreas Kling há 2 anos atrás
pai
commit
2e2c717e89

+ 1 - 1
Userland/Libraries/LibGfx/Font/BitmapFont.h

@@ -66,7 +66,7 @@ public:
     virtual float glyph_or_emoji_width(Utf32CodePointIterator&) const override;
 
     float glyphs_horizontal_kerning(u32, u32) const override { return 0.f; }
-    u8 glyph_height() const override { return m_glyph_height; }
+    u8 glyph_height() const { return m_glyph_height; }
     int x_height() const override { return m_x_height; }
     virtual float preferred_line_height() const override { return glyph_height() + m_line_gap; }
 

+ 0 - 1
Userland/Libraries/LibGfx/Font/Font.h

@@ -175,7 +175,6 @@ public:
     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 u8 glyph_height() const = 0;
     virtual int x_height() const = 0;
     virtual float preferred_line_height() const = 0;
 

+ 0 - 1
Userland/Libraries/LibGfx/Font/ScaledFont.h

@@ -51,7 +51,6 @@ public:
     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 u8 glyph_height() const override { return pixel_size(); }
     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