preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-15 18:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3504 from thedax/master

Browse Source 
Win32: Allow user to specify a specific font in their language's ini file.
This commit is contained in:
Henrik Rydgård committed 2013-08-30 10:54:25 -07:00
2 parents 3860f6f5db 39db37cfd3
commit c5745ac463
2 files changed
+9 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Config.h
+1
View File
@@ -44,6 +44,7 @@ public:
bool bEnableLogging;
#ifdef _WIN32
bool bTopMost;
std::string sFont;
#endif
// Core
bool bIgnoreBadMemAccess;
UI/NativeApp.cpp
+8 -3
View File
@@ -372,6 +372,11 @@ void NativeInit(int argc, const char *argv[],
#endif
i18nrepo.LoadIni(g_Config.languageIni);
I18NCategory *d = GetI18NCategory("DesktopUI");
// Note to translators: do not translate this/add this to PPSSPP-lang's files.
// It's intended to be custom for every user.
// Only add it to your own personal copies of PPSSPP.
g_Config.sFont = d->T("Font", "Trebuchet MS");
if (!boot_filename.empty() && stateToLoad != NULL)
SaveState::Load(stateToLoad);
@@ -406,9 +411,9 @@ void NativeInitGraphics() {
// memset(&ui_theme, 0, sizeof(ui_theme));
// New style theme
ui_theme.uiFont = UI::FontStyle(UBUNTU24, "Trebuchet MS", 20);
ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, "Trebuchet MS", 14);
ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, "Trebuchet MS", 11);
ui_theme.uiFont = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 20);
ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 14);
ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 11);
ui_theme.checkOn = I_CHECKEDBOX;
ui_theme.checkOff = I_SQUARE;