mirror of
https://github.com/libretro/ppsspp.git
synced 2024-11-27 18:30:56 +00:00
Touch controls auto-off on Shield and Xperia Play
This commit is contained in:
parent
567f402845
commit
151c09dff7
@ -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)
|
||||
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
|
||||
|
@ -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
2
native
@ -1 +1 @@
|
||||
Subproject commit 3ea9d45299a8066f451878e3ace127c947cc7a2f
|
||||
Subproject commit ae0847cecbac76c7c7901ab76824a91c29b7329e
|
Loading…
Reference in New Issue
Block a user