From b4d13907148f2790482df5608b4e6c4ae6a68bc8 Mon Sep 17 00:00:00 2001
From: Stephan Unverwerth <s.unverwerth@gmx.de>
Date: Tue, 29 Dec 2020 18:25:13 +0100
Subject: LibGFX: Move default_xxx_font() methods from Font to FontDatabase

When we have an abstract font class it makes no sense to keep
these methods in the Font class.
---
 MenuApplets/Audio/main.cpp    | 3 ++-
 MenuApplets/Clock/main.cpp    | 5 +++--
 MenuApplets/UserName/main.cpp | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'MenuApplets')

diff --git a/MenuApplets/Audio/main.cpp b/MenuApplets/Audio/main.cpp
index 1cec702530..ddfa3cb2d3 100644
--- a/MenuApplets/Audio/main.cpp
+++ b/MenuApplets/Audio/main.cpp
@@ -35,6 +35,7 @@
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibGfx/Palette.h>
 
 class AudioWidget final : public GUI::Widget {
@@ -161,7 +162,7 @@ private:
 
         if (m_show_percent) {
             auto volume_text = m_audio_muted ? "mute" : String::format("%d%%", m_audio_volume);
-            painter.draw_text({ 16, 3, 24, 16 }, volume_text, Gfx::Font::default_fixed_width_font(), Gfx::TextAlignment::TopLeft, palette().window_text());
+            painter.draw_text({ 16, 3, 24, 16 }, volume_text, Gfx::FontDatabase::default_fixed_width_font(), Gfx::TextAlignment::TopLeft, palette().window_text());
         }
     }
 
diff --git a/MenuApplets/Clock/main.cpp b/MenuApplets/Clock/main.cpp
index 6c61ecc5ec..153127b3be 100644
--- a/MenuApplets/Clock/main.cpp
+++ b/MenuApplets/Clock/main.cpp
@@ -36,6 +36,7 @@
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibGfx/Palette.h>
 #include <serenity.h>
 #include <spawn.h>
@@ -47,7 +48,7 @@ class ClockWidget final : public GUI::Widget {
 public:
     ClockWidget()
     {
-        m_time_width = Gfx::Font::default_bold_font().width("2222-22-22 22:22:22");
+        m_time_width = Gfx::FontDatabase::default_bold_font().width("2222-22-22 22:22:22");
 
         m_timer = add<Core::Timer>(1000, [this] {
             static time_t last_update_time;
@@ -217,7 +218,7 @@ private:
         auto time_text = Core::DateTime::now().to_string();
         GUI::Painter painter(*this);
         painter.fill_rect(event.rect(), palette().window());
-        painter.draw_text(event.rect(), time_text, Gfx::Font::default_font(), Gfx::TextAlignment::Center, palette().window_text());
+        painter.draw_text(event.rect(), time_text, Gfx::FontDatabase::default_font(), Gfx::TextAlignment::Center, palette().window_text());
     }
 
     virtual void mousedown_event(GUI::MouseEvent& event) override
diff --git a/MenuApplets/UserName/main.cpp b/MenuApplets/UserName/main.cpp
index 666552a7d4..df4e133463 100644
--- a/MenuApplets/UserName/main.cpp
+++ b/MenuApplets/UserName/main.cpp
@@ -29,6 +29,7 @@
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibGfx/Palette.h>
 #include <stdio.h>
 
@@ -38,7 +39,7 @@ public:
     UserNameWidget()
     {
         m_username = getlogin();
-        m_username_width = Gfx::Font::default_bold_font().width(m_username);
+        m_username_width = Gfx::FontDatabase::default_bold_font().width(m_username);
     }
 
     virtual ~UserNameWidget() override { }
@@ -55,7 +56,7 @@ private:
     {
         GUI::Painter painter(*this);
         painter.fill_rect(event.rect(), palette().window());
-        painter.draw_text(event.rect(), m_username, Gfx::Font::default_bold_font(), Gfx::TextAlignment::Center, palette().window_text());
+        painter.draw_text(event.rect(), m_username, Gfx::FontDatabase::default_bold_font(), Gfx::TextAlignment::Center, palette().window_text());
     }
 
     String m_username;
-- 
cgit v1.2.3