StFTFontRegistry - look for the fonts within APP_PREFIX/share/fonts a…

…nd $StShare/fonts
gkv311 · Sep 28, 2024 · c6aac6d · c6aac6d
1 parent b7b47c3
commit c6aac6d
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/StShared/StFTFontRegistry.cpp b/StShared/StFTFontRegistry.cpp
@@ -26,6 +26,10 @@ StFTFontRegistry::StFTFontRegistry() {
     myExtensions.add("ttc");
     myExtensions.add("otf");
 
+    const StString aCustFontDir = StProcess::getStShareFolder() + "fonts" + SYS_FS_SPLITTER;
+    if(StFolder::isFolder(aCustFontDir)) {
+        myFolders.add(aCustFontDir);
+    }
 #ifdef _WIN32
     myFolders.add(StProcess::getWindowsFolder() + "fonts");
 
@@ -133,6 +137,12 @@ StFTFontRegistry::StFTFontRegistry() {
     }
 #endif
     if(myFolders.isEmpty()) {
+    #ifdef APP_PREFIX
+        if(!StString(stCString(APP_PREFIX)).isEquals(stCString("/usr"))) {
+            myFolders.add(stCString(APP_PREFIX"/share/fonts"));
+            myFolders.add(stCString(APP_PREFIX"/local/share/fonts"));
+        }
+    #endif
         myFolders.add(stCString("/usr/share/fonts"));
         myFolders.add(stCString("/usr/local/share/fonts"));
     }