Skip to content

Commit

Permalink
Add fonts from mounted folders (#1051)
Browse files Browse the repository at this point in the history
* Add fonts from all mount paths

closes #980

* Optimise includes

* Woopsie
  • Loading branch information
Salanto authored Oct 17, 2024
1 parent 4c22bdc commit 7f17c0b
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "aoapplication.h"

#include "courtroom.h"
#include "datatypes.h"
#include "file_functions.h"
#include "lobby.h"

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

QDirIterator it(get_base_path() + "fonts", QDirIterator::Subdirectories);
while (it.hasNext())
QStringList font_paths;
font_paths.append(get_base_path());
font_paths.append(Options::getInstance().mountPaths());

for (const QString &path : font_paths)
{
QFontDatabase::addApplicationFont(it.next());
QDirIterator it(path + "fonts", QDirIterator::Subdirectories);
while (it.hasNext())
{
QFontDatabase::addApplicationFont(it.next());
}
}

QStringList expected_formats{"webp", "apng", "gif"};
Expand Down

0 comments on commit 7f17c0b

Please sign in to comment.