Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Touch controls auto-off on Shield and Xperia Play

Browse source
This commit is contained in:
Henrik Rydgard 2013-08-20 15:40:19 +02:00
parent 567f402845
commit 151c09dff7
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Core/Config.cpp
View file

@ -153,7 +153,12 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
#ifdef BLACKBERRY
control->Get("ShowTouchControls", &bShowTouchControls, pixel_xres != pixel_yres);
#elif defined(USING_GLES2)
control->Get("ShowTouchControls", &bShowTouchControls, true);
std::string name = System_GetName();
if (name == "NVIDIA:SHIELD" || name == "Sony Ericsson:R800i" || name == "Sony Ericsson:zeus") {
control->Get("ShowTouchControls", &bShowTouchControls, false);
} else {
control->Get("ShowTouchControls", &bShowTouchControls, true);
}
#else
control->Get("ShowTouchControls", &bShowTouchControls, false);
#endif

2
UI/ControlMappingScreen.cpp
View file

@ -86,7 +86,7 @@ void ControlMapper::Refresh() {
root->Add(new Choice(keyName_, new LinearLayoutParams(200, WRAP_CONTENT)))->OnClick.Handle(this, &ControlMapper::OnReplaceAll);
LinearLayout *rightColumn = root->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
rightColumn->SetSpacing(2.0f);
std::vector<KeyDef> mappings;
KeyMap::KeyFromPspButton(pspKey_, &mappings);

2
native

@ -1 +1 @@
Subproject commit 3ea9d45299a8066f451878e3ace127c947cc7a2f
Subproject commit ae0847cecbac76c7c7901ab76824a91c29b7329e