From 8a6c37deef4913d44aae61385d702f92a01c314b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 20 May 2021 18:55:23 +0200 Subject: [PATCH] LibGfx: Remove Gfx::FontDatabase::default_bold_fixed_width_font() Ask for a bold_variant() of the default_fixed_width_font() instead. --- Tests/LibGfx/TestFontHandling.cpp | 5 ----- Userland/Demos/LibGfxDemo/main.cpp | 2 +- Userland/Games/Snake/SnakeGame.cpp | 2 +- Userland/Libraries/LibGfx/FontDatabase.cpp | 10 ---------- Userland/Libraries/LibGfx/FontDatabase.h | 2 -- Userland/Libraries/LibVT/TerminalWidget.cpp | 3 +-- Userland/Libraries/LibWeb/CSS/StyleProperties.cpp | 2 +- 7 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Tests/LibGfx/TestFontHandling.cpp b/Tests/LibGfx/TestFontHandling.cpp index b2c1e087e4..3f759b9912 100644 --- a/Tests/LibGfx/TestFontHandling.cpp +++ b/Tests/LibGfx/TestFontHandling.cpp @@ -46,11 +46,6 @@ TEST_CASE(test_default_fixed_width_font) EXPECT(!Gfx::FontDatabase::default_fixed_width_font().name().is_null()); } -TEST_CASE(test_default_bold_fixed_width_font) -{ - EXPECT(!Gfx::FontDatabase::default_bold_fixed_width_font().name().is_null()); -} - TEST_CASE(test_clone) { u8 glyph_height = 1; diff --git a/Userland/Demos/LibGfxDemo/main.cpp b/Userland/Demos/LibGfxDemo/main.cpp index a0421adece..a293bd7dff 100644 --- a/Userland/Demos/LibGfxDemo/main.cpp +++ b/Userland/Demos/LibGfxDemo/main.cpp @@ -149,7 +149,7 @@ void Canvas::draw() painter.draw_text({ 520, 415, 240, 20 }, "Normal text", Gfx::FontDatabase::default_font(), Gfx::TextAlignment::CenterLeft, Color::Red); painter.draw_text({ 520, 430, 240, 20 }, "Bold text", Gfx::FontDatabase::default_font().bold_variant(), Gfx::TextAlignment::CenterLeft, Color::Green); painter.draw_text({ 520, 450, 240, 20 }, "Normal text (fixed width)", Gfx::FontDatabase::default_fixed_width_font(), Gfx::TextAlignment::CenterLeft, Color::Blue); - painter.draw_text({ 520, 465, 240, 20 }, "Bold text (fixed width)", Gfx::FontDatabase::default_bold_fixed_width_font(), Gfx::TextAlignment::CenterLeft, Color::Yellow); + painter.draw_text({ 520, 465, 240, 20 }, "Bold text (fixed width)", Gfx::FontDatabase::default_fixed_width_font().bold_variant(), Gfx::TextAlignment::CenterLeft, Color::Yellow); auto font = Gfx::BitmapFont::load_from_file("/res/fonts/PebbletonBold14.font"); painter.draw_rect({ 520, 510, 240, 30 }, Color::DarkGray); diff --git a/Userland/Games/Snake/SnakeGame.cpp b/Userland/Games/Snake/SnakeGame.cpp index c8d8e423fb..5a63aa5e37 100644 --- a/Userland/Games/Snake/SnakeGame.cpp +++ b/Userland/Games/Snake/SnakeGame.cpp @@ -15,7 +15,7 @@ SnakeGame::SnakeGame() { - set_font(Gfx::FontDatabase::default_bold_fixed_width_font()); + set_font(Gfx::FontDatabase::default_fixed_width_font().bold_variant()); m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/paprika.png")); m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/eggplant.png")); m_fruit_bitmaps.append(*Gfx::Bitmap::load_from_file("/res/icons/snake/cauliflower.png")); diff --git a/Userland/Libraries/LibGfx/FontDatabase.cpp b/Userland/Libraries/LibGfx/FontDatabase.cpp index b71bc61c01..d059de5f94 100644 --- a/Userland/Libraries/LibGfx/FontDatabase.cpp +++ b/Userland/Libraries/LibGfx/FontDatabase.cpp @@ -44,16 +44,6 @@ Font& FontDatabase::default_fixed_width_font() return *font; } -Font& FontDatabase::default_bold_fixed_width_font() -{ - static Font* font; - if (!font) { - font = FontDatabase::the().get_by_name("Csilla 10 700"); - VERIFY(font); - } - return *font; -} - struct FontDatabase::Private { HashMap> full_name_to_font_map; Vector> typefaces; diff --git a/Userland/Libraries/LibGfx/FontDatabase.h b/Userland/Libraries/LibGfx/FontDatabase.h index 64b029dd90..7ad5f8b691 100644 --- a/Userland/Libraries/LibGfx/FontDatabase.h +++ b/Userland/Libraries/LibGfx/FontDatabase.h @@ -35,9 +35,7 @@ public: static FontDatabase& the(); static Font& default_font(); - static Font& default_fixed_width_font(); - static Font& default_bold_fixed_width_font(); RefPtr get(const String& family, unsigned size, unsigned weight); RefPtr get(const String& family, const String& variant, unsigned size); diff --git a/Userland/Libraries/LibVT/TerminalWidget.cpp b/Userland/Libraries/LibVT/TerminalWidget.cpp index db287562eb..e9bf2ca410 100644 --- a/Userland/Libraries/LibVT/TerminalWidget.cpp +++ b/Userland/Libraries/LibVT/TerminalWidget.cpp @@ -1063,8 +1063,7 @@ void TerminalWidget::did_change_font() GUI::Frame::did_change_font(); m_line_height = font().glyph_height() + m_line_spacing; - // TODO: try to find a bold version of the new font (e.g. CsillaThin7x10 -> CsillaBold7x10) - const Gfx::Font& bold_font = Gfx::FontDatabase::default_bold_fixed_width_font(); + const Gfx::Font& bold_font = font().bold_variant(); if (bold_font.glyph_height() == font().glyph_height() && bold_font.glyph_width(' ') == font().glyph_width(' ')) m_bold_font = &bold_font; diff --git a/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp b/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp index 5fa06a9b31..f08ec06fa9 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp @@ -194,7 +194,7 @@ void StyleProperties::load_font() const RefPtr StyleProperties::font_fallback(bool monospace, bool bold) const { if (monospace && bold) - return Gfx::FontDatabase::default_bold_fixed_width_font(); + return Gfx::FontDatabase::default_fixed_width_font().bold_variant(); if (monospace) return Gfx::FontDatabase::default_fixed_width_font();