Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Default to true for all touch control visibility, and actually translate Control Visibility.

Browse Source
This commit is contained in:
The Dax 2013-10-19 23:59:57 -04:00
parent 7bfa071370
commit 11a34746cf
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Core/Config.cpp
View File

@ -192,16 +192,16 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
IniFile::Section *control = iniFile.GetOrCreateSection("Control");
control->Get("HapticFeedback", &bHapticFeedback, true);
control->Get("ShowAnalogStick", &bShowTouchAnalogStick, true);
control->Get("ShowTouchCross", &bShowTouchCross);
control->Get("ShowTouchCircle", &bShowTouchCircle);
control->Get("ShowTouchSquare", &bShowTouchSquare);
control->Get("ShowTouchTriangle", &bShowTouchTriangle);
control->Get("ShowTouchStart", &bShowTouchStart);
control->Get("ShowTouchCross", &bShowTouchCross, true);
control->Get("ShowTouchCircle", &bShowTouchCircle, true);
control->Get("ShowTouchSquare", &bShowTouchSquare, true);
control->Get("ShowTouchTriangle", &bShowTouchTriangle, true);
control->Get("ShowTouchStart", &bShowTouchStart, true);
control->Get("ShowTouchSelect", &bShowTouchSelect);
control->Get("ShowTouchLTrigger", &bShowTouchLTrigger);
control->Get("ShowTouchRTrigger", &bShowTouchRTrigger);
control->Get("ShowAnalogStick", &bShowTouchAnalogStick);
control->Get("ShowTouchUnthrottle", &bShowTouchUnthrottle);
control->Get("ShowTouchLTrigger", &bShowTouchLTrigger, true);
control->Get("ShowTouchRTrigger", &bShowTouchRTrigger, true);
control->Get("ShowAnalogStick", &bShowTouchAnalogStick, true);
control->Get("ShowTouchUnthrottle", &bShowTouchUnthrottle, true);
#if defined(USING_GLES2)
std::string name = System_GetProperty(SYSPROP_NAME);

2
UI/GameSettingsScreen.cpp
View File

@ -214,7 +214,7 @@ void GameSettingsScreen::CreateViews() {
controlsSettings->Add(new ItemHeader(c->T("OnScreen", "On-Screen Touch Controls")));
controlsSettings->Add(new CheckBox(&g_Config.bShowTouchControls, c->T("OnScreen", "On-Screen Touch Controls")));
controlsSettings->Add(new Choice(c->T("Custom layout...")))->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlLayout);
controlsSettings->Add(new Choice("Control Visibility..."))->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlVisibility);
controlsSettings->Add(new Choice(c->T("Control Visibility...")))->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlVisibility);
controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager()));
controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fButtonScale, 0.80, 2.0, c->T("Button Scaling"), screenManager()));