Ver código fonte

SharedGraphics: Removed some unused stuff from Font.

Andreas Kling 6 anos atrás
pai
commit
10d6f9ce31

+ 1 - 0
LibGUI/GScrollBar.cpp

@@ -1,5 +1,6 @@
 #include <LibGUI/GScrollBar.h>
 #include <LibGUI/GStyle.h>
+#include <SharedGraphics/CharacterBitmap.h>
 #include <SharedGraphics/GraphicsBitmap.h>
 #include <SharedGraphics/Painter.h>
 

+ 0 - 23
SharedGraphics/Font.cpp

@@ -9,21 +9,6 @@
 #include <LibC/errno.h>
 #include <LibC/mman.h>
 
-static const byte error_glyph_width = 8;
-static const byte error_glyph_height = 10;
-static constexpr const char* error_glyph {
-    "  ####  "
-    " #    # "
-    " #    # "
-    " # ## # "
-    " # ## # "
-    "  ####  "
-    "   ##   "
-    " ###### "
-    "   ##   "
-    "   ##   ",
-};
-
 static Font* s_default_font;
 static Font* s_default_bold_font;
 
@@ -36,11 +21,6 @@ struct [[gnu::packed]] FontFileHeader {
     char name[64];
 };
 
-static inline constexpr size_t font_file_size(unsigned glyph_height)
-{
-    return sizeof(FontFileHeader) + 256 * sizeof(dword) * glyph_height;
-}
-
 Font& Font::default_font()
 {
     static const char* default_font_path = "/res/fonts/LizaRegular8x10.font";
@@ -76,9 +56,6 @@ Font::Font(const String& name, unsigned* rows, byte glyph_width, byte glyph_heig
     , m_glyph_width(glyph_width)
     , m_glyph_height(glyph_height)
 {
-    ASSERT(m_glyph_width == error_glyph_width);
-    ASSERT(m_glyph_height == error_glyph_height);
-    m_error_bitmap = CharacterBitmap::create_from_ascii(error_glyph, error_glyph_width, error_glyph_height);
 }
 
 Font::~Font()

+ 1 - 3
SharedGraphics/Font.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CharacterBitmap.h"
+#include <SharedGraphics/Rect.h>
 #include <AK/Retainable.h>
 #include <AK/RetainPtr.h>
 #include <AK/AKString.h>
@@ -69,8 +69,6 @@ private:
     unsigned* m_rows { nullptr };
     void* m_mmap_ptr { nullptr };
 
-    RetainPtr<CharacterBitmap> m_error_bitmap;
-
     byte m_glyph_width { 0 };
     byte m_glyph_height { 0 };
 };

+ 1 - 0
SharedGraphics/Painter.cpp

@@ -1,6 +1,7 @@
 #include "Painter.h"
 #include "Font.h"
 #include "GraphicsBitmap.h"
+#include <SharedGraphics/CharacterBitmap.h>
 #include <AK/Assertions.h>
 #include <AK/StdLibExtras.h>