Fix search for SFMono font on macOS Catalina

This commit is contained in:
Jason Haslam 2019-10-30 13:35:28 -06:00
parent ebfaced770
commit 1e7809521f

View File

@ -165,8 +165,12 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
registerService();
// Load SF Mono font from Terminal.app.
QDir dir("/Applications/Utilities/Terminal.app/Contents/Resources/Fonts");
QFontDatabase::addApplicationFont(dir.filePath("SFMono-Regular.otf"));
QDir dir("/System/Applications");
if (!dir.exists())
dir = "/Applications";
dir.cd("Utilities/Terminal.app/Contents/Resources/Fonts");
foreach (const QString &name, dir.entryList({"SFMono-*.otf"}, QDir::Files))
QFontDatabase::addApplicationFont(dir.filePath(name));
// Don't quit on close.
setQuitOnLastWindowClosed(false);