mirror of
https://github.com/libretro/ppsspp.git
synced 2024-11-25 09:09:49 +00:00
Merge branch 'bhavin192-patch-1'
This commit is contained in:
commit
dbbd7c0137
@ -215,7 +215,7 @@ void GameSettingsScreen::CreateViews() {
|
||||
controlsSettings->Add(new ItemHeader(ms->T("Controls")));
|
||||
controlsSettings->Add(new Choice(c->T("Control Mapping")))->OnClick.Handle(this, &GameSettingsScreen::OnControlMapping);
|
||||
|
||||
#ifdef USING_GLES2
|
||||
#if defined(USING_GLES2)
|
||||
controlsSettings->Add(new CheckBox(&g_Config.bHapticFeedback, c->T("HapticFeedback", "Haptic Feedback (vibration)")));
|
||||
controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)")));
|
||||
Choice *tiltAnalog = controlsSettings->Add(new Choice(c->T("Customize tilt")));
|
||||
|
@ -24,6 +24,7 @@ void TiltAnalogSettingsScreen::CreateViews() {
|
||||
using namespace UI;
|
||||
|
||||
I18NCategory *c = GetI18NCategory("Controls");
|
||||
I18NCategory *d = GetI18NCategory("Dialog");
|
||||
|
||||
root_ = new ScrollView(ORIENT_VERTICAL);
|
||||
|
||||
@ -49,6 +50,8 @@ void TiltAnalogSettingsScreen::CreateViews() {
|
||||
settings->Add(calibrate);
|
||||
|
||||
root_->Add(settings);
|
||||
settings->Add(new ItemHeader(""));
|
||||
settings->Add(new Choice(d->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
||||
}
|
||||
|
||||
void TiltAnalogSettingsScreen::update(InputState &input) {
|
||||
|
Loading…
Reference in New Issue
Block a user