MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Adjust font defaults"

Browse Source 
This reverts commit 30f56c98bd.

See #1758 for details.
This commit is contained in:
Sergey Lipskiy 2018-03-19 14:08:29 +07:00
parent ed223c96ef
commit afb6f7e857
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Config.cpp
View File

@ -94,11 +94,9 @@ void Config::resetToDefaults()
#elif defined (OS_ANDROID)
font.name.assign("DroidSans.ttf");
#elif defined (PANDORA)
font.name.assign("truetype/LiberationMono-Regular.ttf");
#elif defined (OS_LINUX)
font.name.assign("liberation/LiberationMono-Regular.ttf");
font.name.assign("LiberationMono-Regular.ttf");
#else
font.name.assign("truetype/freefont/FreeSans.ttf");
font.name = "FreeSans.ttf";
#endif
font.size = 18;
font.color[0] = 0xB5;

6
src/TextDrawer.cpp
View File

@ -201,11 +201,9 @@ bool getFontFileName(char * _strName)
#elif defined (OS_ANDROID)
sprintf(_strName, "/system/fonts/%s", config.font.name.c_str());
#elif defined (PANDORA)
sprintf(_strName, "/usr/share/fonts/%s", config.font.name.c_str());
#elif defined (OS_LINUX)
sprintf(_strName, "/usr/share/fonts/%s", config.font.name.c_str());
sprintf(_strName, "/usr/share/fonts/truetype/%s", config.font.name.c_str());
#else
sprintf(_strName, "/usr/share/fonts/%s", config.font.name.c_str());
sprintf(_strName, "/usr/share/fonts/truetype/freefont/%s", config.font.name.c_str());
#endif
return true;
}