From 23edd92d4a4ba8abe700a0b0edd6cfea19fbef14 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Thu, 3 Nov 2022 22:49:56 +0100
Subject: Config: add option to set custom fonts without using system config
 (fontconfig)

---
 include/Config.hpp         | 16 ++++++++++++----
 include/ResourceLoader.hpp |  1 -
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/Config.hpp b/include/Config.hpp
index d7bfddf..bd80021 100644
--- a/include/Config.hpp
+++ b/include/Config.hpp
@@ -51,17 +51,24 @@ namespace QuickMedia {
         std::vector<std::string> known_homeservers;
     };
 
-    struct Peertube {
+    struct PeertubeConfig {
         std::vector<std::string> known_instances;
     };
 
-    struct Download {
+    struct DownloadConfig {
         std::string video_directory;
         std::string image_directory;
         std::string music_directory;
         std::string file_directory;
     };
 
+    struct FontConfig {
+        std::string latin;
+        std::string latin_bold;
+        std::string cjk;
+        std::string symbols;
+    };
+
     struct Config {
         Config() = default;
         Config(const Config&) = delete;
@@ -76,8 +83,9 @@ namespace QuickMedia {
         LocalAnimeConfig local_anime;
         YoutubeConfig youtube;
         MatrixConfig matrix;
-        Peertube peertube;
-        Download download;
+        PeertubeConfig peertube;
+        DownloadConfig download;
+        FontConfig font;
         bool use_system_fonts = false;
         bool use_system_mpv_config = false;
         bool enable_shaders = true;
diff --git a/include/ResourceLoader.hpp b/include/ResourceLoader.hpp
index f2b2888..c60f1f3 100644
--- a/include/ResourceLoader.hpp
+++ b/include/ResourceLoader.hpp
@@ -8,7 +8,6 @@ namespace mgl {
 namespace QuickMedia {
     void set_resource_loader_root_path(const char *resource_root);
     const char* get_resource_loader_root_path();
-    void set_use_system_fonts(bool use);
 }
 
 namespace QuickMedia::FontLoader {
-- 
cgit v1.2.3