Use QStandardPaths::locateAll to locate all font directories

gonetz · Jan 8, 2025 · 4e2052e · 4e2052e
1 parent d5be3c6
commit 4e2052e
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/GLideNUI/ConfigDialog.cpp b/src/GLideNUI/ConfigDialog.cpp
@@ -1025,17 +1025,19 @@ void ConfigDialog::on_tabWidget_currentChanged(int tab)
 		ui->tabWidget->setCursor(QCursor(Qt::WaitCursor));
 
 		QMap<QString, QStringList> internalFontList;
-		QString fontDir = QStandardPaths::locate(QStandardPaths::FontsLocation, QString(), QStandardPaths::LocateDirectory);
 		QStringList fontFilter;
 		fontFilter << "*.ttf";
-		QDirIterator fontIt(fontDir, fontFilter, QDir::Files, QDirIterator::Subdirectories);
-		while (fontIt.hasNext()) {
-			QString font = fontIt.next();
-			int id = QFontDatabase::addApplicationFont(font);
-			QStringList fontListFamilies = QFontDatabase::applicationFontFamilies(id);
-			if (!fontListFamilies.isEmpty()) {
-				QString fontListFamily = fontListFamilies.at(0);
-				internalFontList[fontListFamily].append(font);
+		QStringList fontDirs = QStandardPaths::locateAll(QStandardPaths::FontsLocation, QString(), QStandardPaths::LocateDirectory);
+		for (const QString& fontDir : fontDirs) {
+			QDirIterator fontIt(fontDir, fontFilter, QDir::Files, QDirIterator::Subdirectories);
+			while (fontIt.hasNext()) {
+				QString font = fontIt.next();
+				int id = QFontDatabase::addApplicationFont(font);
+				QStringList fontListFamilies = QFontDatabase::applicationFontFamilies(id);
+				if (!fontListFamilies.isEmpty()) {
+					QString fontListFamily = fontListFamilies.at(0);
+					internalFontList[fontListFamily].append(font);
+				}
 			}
 		}