Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add fonts from mounted folders (#1051)

Browse Source 
* Add fonts from all mount paths

closes #980

* Optimise includes

* Woopsie
This commit is contained in:
Salanto 2024-10-17 22:19:23 +02:00 committed by GitHub
parent 4c22bdc336
commit 7f17c0b697
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@ -2,7 +2,7 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "courtroom.h" #include "courtroom.h"
#include "datatypes.h" #include "file_functions.h"
#include "lobby.h" #include "lobby.h"
#include <QDebug> #include <QDebug>
@ -41,10 +41,17 @@ int main(int argc, char *argv[])
new_font.setPointSize(new_font_size); new_font.setPointSize(new_font_size);
QApplication::setFont(new_font); QApplication::setFont(new_font);
QDirIterator it(get_base_path() + "fonts", QDirIterator::Subdirectories); QStringList font_paths;
while (it.hasNext()) 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"}; QStringList expected_formats{"webp", "apng", "gif"};