RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:57:44 +00:00
Code Issues Activity Actions

LibGfx: Make BitmapFont::variant() report a complete typeface

Browse source
This commit is contained in:
thankyouverycool 2021-09-23 19:43:55 -04:00 • committed by Andreas Kling
parent 39484fc02c
commit 84ce923850
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <LibCore/FileStream.h> #include <LibCore/FileStream.h>
#include <LibGfx/FontDatabase.h> #include <LibGfx/FontDatabase.h>
#include <LibGfx/FontStyleMapping.h>
namespace Gfx { namespace Gfx {
@ -348,6 +349,20 @@ String BitmapFont::qualified_name() const
return String::formatted("{} {} {}", family(), presentation_size(), weight()); return String::formatted("{} {} {}", family(), presentation_size(), weight());
} }
String BitmapFont::variant() const
{
StringBuilder builder;
builder.append(weight_to_name(weight()));
if (slope()) {
if (builder.string_view() == "Regular"sv)
builder.clear();
else
builder.append(" ");
builder.append(slope_to_name(slope()));
}
return builder.to_string();
}
Font const& Font::bold_variant() const Font const& Font::bold_variant() const
{ {
if (m_bold_variant) if (m_bold_variant)

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

@ -100,7 +100,7 @@ public:
String family() const override { return m_family; } String family() const override { return m_family; }
void set_family(String family) { m_family = move(family); } void set_family(String family) { m_family = move(family); }
String variant() const override { return String::number(weight()); } String variant() const override;
String qualified_name() const override; String qualified_name() const override;