RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:37:45 +00:00
Code Issues Activity Actions

LibGfx: Add a count to FontTypes and a helper to return type names

Browse source
This commit is contained in:
thankyouverycool 2021-04-10 13:14:15 -04:00 • committed by Andreas Kling
parent 25bd4b33a7
commit c283429196
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibGfx/BitmapFont.cpp
View file

@ -175,6 +175,21 @@ size_t BitmapFont::glyph_count_by_type(FontTypes type)
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
String BitmapFont::type_name_by_type(FontTypes type)
{
if (type == FontTypes::Default)
return "Default";
if (type == FontTypes::LatinExtendedA)
return "LatinExtendedA";
if (type == FontTypes::Cyrillic)
return "Cyrillic";
dbgln("Unknown font type: {}", (int)type);
VERIFY_NOT_REACHED();
}
RefPtr<BitmapFont> BitmapFont::load_from_file(const StringView& path) RefPtr<BitmapFont> BitmapFont::load_from_file(const StringView& path)
{ {
if (Core::File::is_device(path)) if (Core::File::is_device(path))

13
Userland/Libraries/LibGfx/BitmapFont.h
View file

@ -36,12 +36,13 @@
namespace Gfx { namespace Gfx {
// Note: Perhaps put glyph count directly in header
// and sidestep FontType conflation/sync maintenance
enum FontTypes { enum FontTypes {
Default = 0, Default = 0,
LatinExtendedA = 1, LatinExtendedA,
// There are many blocks between LatinExtendedA and Cyrrilic that has to be added later. Cyrillic,
// Cyrrilic has to be switched to another number __Count
Cyrillic = 2
}; };
class BitmapFont : public Font { class BitmapFont : public Font {
@ -118,11 +119,13 @@ public:
const Font& bold_variant() const; const Font& bold_variant() const;
static size_t glyph_count_by_type(FontTypes type);
static String type_name_by_type(FontTypes type);
private: private:
BitmapFont(String name, String family, unsigned* rows, u8* widths, bool is_fixed_width, u8 glyph_width, u8 glyph_height, u8 glyph_spacing, FontTypes type, u8 baseline, u8 mean_line, u8 presentation_size, u16 weight, bool owns_arrays = false); BitmapFont(String name, String family, unsigned* rows, u8* widths, bool is_fixed_width, u8 glyph_width, u8 glyph_height, u8 glyph_spacing, FontTypes type, u8 baseline, u8 mean_line, u8 presentation_size, u16 weight, bool owns_arrays = false);
static RefPtr<BitmapFont> load_from_memory(const u8*); static RefPtr<BitmapFont> load_from_memory(const u8*);
static size_t glyph_count_by_type(FontTypes type);
void update_x_height() { m_x_height = m_baseline - m_mean_line; }; void update_x_height() { m_x_height = m_baseline - m_mean_line; };