mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 11:24:27 +01:00
Merge branch 'master' of https://github.com/hrydgard/ppsspp
This commit is contained in:
commit
99754bcd7a
20 files changed
+247
-120
No files matched your search
+5
-1
@@ -60,6 +60,7 @@
|
||||
#include "UI/EmuScreen.h"
|
||||
#include "UI/PluginScreen.h"
|
||||
#include "UI/MainScreen.h"
|
||||
#include "UI/MiscScreens.h"
|
||||
|
||||
#include "GameInfoCache.h"
|
||||
#include "android/jni/TestRunner.h"
|
||||
@@ -1469,7 +1470,10 @@ void SystemScreen::render() {
|
||||
ui_draw2d.DrawTextShadow(UBUNTU24, lang, x, y += stride, 0xFFFFFFFF, ALIGN_LEFT);
|
||||
HLinear hlinear2(x + 400, y, 20);
|
||||
if (UIButton(GEN_ID, hlinear2, 220, 0, s->T("Language"), ALIGN_TOPLEFT)) {
|
||||
screenManager()->push(new LanguageScreen());
|
||||
if (g_Config.bNewUI)
|
||||
screenManager()->push(new NewLanguageScreen());
|
||||
else
|
||||
screenManager()->push(new LanguageScreen());
|
||||
}
|
||||
y+=20;
|
||||
|
||||
|
||||
Reference in new issue
Block a user