Skip to content

Commit 7f17c0b

Browse files
authored
Add fonts from mounted folders (#1051)
* Add fonts from all mount paths closes #980 * Optimise includes * Woopsie
1 parent 4c22bdc commit 7f17c0b

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/main.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "aoapplication.h"
33

44
#include "courtroom.h"
5-
#include "datatypes.h"
5+
#include "file_functions.h"
66
#include "lobby.h"
77

88
#include <QDebug>
@@ -41,10 +41,17 @@ int main(int argc, char *argv[])
4141
new_font.setPointSize(new_font_size);
4242
QApplication::setFont(new_font);
4343

44-
QDirIterator it(get_base_path() + "fonts", QDirIterator::Subdirectories);
45-
while (it.hasNext())
44+
QStringList font_paths;
45+
font_paths.append(get_base_path());
46+
font_paths.append(Options::getInstance().mountPaths());
47+
48+
for (const QString &path : font_paths)
4649
{
47-
QFontDatabase::addApplicationFont(it.next());
50+
QDirIterator it(path + "fonts", QDirIterator::Subdirectories);
51+
while (it.hasNext())
52+
{
53+
QFontDatabase::addApplicationFont(it.next());
54+
}
4855
}
4956

5057
QStringList expected_formats{"webp", "apng", "gif"};

0 commit comments

Comments
 (0)