thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable pause button when not using touch.

Browse source 
Remove per-game status from some settings which shouldn't be per-game.
This commit is contained in:
LunaMoo 2017-04-14 17:11:16 +02:00
parent aa2b4a2bf2
commit 372cbaac15
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Core/Config.cpp
View file

@ -413,7 +413,7 @@ static ConfigSetting cpuSettings[] = {
ReportedConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_FAST, true, true),
ConfigSetting("FastMemoryAccess", &g_Config.bFastMemory, true, true, true),
ReportedConfigSetting("FuncReplacements", &g_Config.bFuncReplacements, true, true, true),
ConfigSetting("HideSlowWarnings", &g_Config.bHideSlowWarnings, false, true, true),
ConfigSetting("HideSlowWarnings", &g_Config.bHideSlowWarnings, false, true, false),
ReportedConfigSetting("CPUSpeed", &g_Config.iLockedCPUSpeed, 0, true, true),
ConfigSetting(false),
@ -612,9 +612,9 @@ static ConfigSetting controlSettings[] = {
#if defined(_WIN32)
// A win32 user seeing touch controls is likely using PPSSPP on a tablet. There it makes
// sense to default this to on.
ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, true, true, true),
ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, true, true, false),
#else
ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, false, true, true),
ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, false, true, false),
#endif
#if defined(USING_WIN_UI)
ConfigSetting("IgnoreWindowsKey", &g_Config.bIgnoreWindowsKey, false, true, true),

6
UI/GamepadEmu.cpp
View file

@ -680,12 +680,6 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause) {
if (g_Config.bShowComboKey4)
root->Add(new ComboKey(g_Config.iCombokey4, roundImage, comboKeyImages[4], combo4_key_scale, new AnchorLayoutParams(combo4_key_X, combo4_key_Y, NONE, NONE, true)));
}
else {
// If there's no hardware back button (or ESC key), add a soft button.
if (!System_GetPropertyInt(SYSPROP_HAS_BACK_BUTTON) || g_Config.bShowTouchPause) {
root->Add(new BoolButton(pause, roundImage, I_ARROW, 1.0f, new AnchorLayoutParams(halfW, 20, NONE, NONE, true)))->SetAngle(90);
}
}
return root;
}