add folders to search the system fonts

6fa18eb2 · Oleg Korshul · 435bb02d · 6fa18eb2
Commit 6fa18eb2 authored Dec 13, 2016 by Oleg Korshul
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

DesktopEditor/fontengine/ApplicationFonts.cpp DesktopEditor/fontengine/ApplicationFonts.cpp +6 -1

No files found.
--- a/DesktopEditor/fontengine/ApplicationFonts.cpp
+++ b/DesktopEditor/fontengine/ApplicationFonts.cpp
@@ -1830,7 +1830,12 @@ CArray<std::wstring> CApplicationFonts::GetSetupFontFiles()
 #endif

 #if defined(__linux__) && !defined(_MAC)
-    return NSDirectory::GetFiles(L"/usr/share/fonts", true);
+     CArray<std::wstring> _array = NSDirectory::GetFiles(L"/usr/share/fonts", true);
+     NSDirectory::GetFiles2(L"/usr/share/X11/fonts", _array, true);
+     NSDirectory::GetFiles2(L"/usr/X11R6/lib/X11/fonts", _array, true);
+     NSDirectory::GetFiles2(L"~/.fonts", _array, true);
+     NSDirectory::GetFiles2(L"~/.local/share/fonts", _array, true);
+     return _array;
 #endif

 #if defined(_MAC) && !defined(_IOS)