History

Fix font loading for MacOS via different font loading method

Zach Fox committed 8 years ago

Commit 747a6b01 parent 260715d29 files · +58 −81Browse files

Showing the changes to interface/src/Application.cpp (1 of 29 files). Show all

Unified · Split

interface/src/Application.cpp+9−0
@@ -978,6 +978,15 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 977 unmodified lines
978 qInstallMessageHandler(messageHandler);978 qInstallMessageHandler(messageHandler);
979 979
980 QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "styles/Inconsolata.otf");980 QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "styles/Inconsolata.otf");
981 QFontDatabase::addApplicationFont(":/fonts/fontawesome-webfont.ttf");
982 QFontDatabase::addApplicationFont(":/fonts/hifi-glyphs.ttf");
983 QFontDatabase::addApplicationFont(":/fonts/AnonymousPro-Regular.ttf");
984 QFontDatabase::addApplicationFont(":/fonts/FiraSans-Regular.ttf");
985 QFontDatabase::addApplicationFont(":/fonts/FiraSans-SemiBold.ttf");
986 QFontDatabase::addApplicationFont(":/fonts/Raleway-Light.ttf");
987 QFontDatabase::addApplicationFont(":/fonts/Raleway-Regular.ttf");
988 QFontDatabase::addApplicationFont(":/fonts/Raleway-Bold.ttf");
989 QFontDatabase::addApplicationFont(":/fonts/Raleway-SemiBold.ttf");
981 _window->setWindowTitle("High Fidelity Interface");990 _window->setWindowTitle("High Fidelity Interface");
982 991
983 Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us992 Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us