ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify accelerometer selection in settings

Browse Source
This commit is contained in:
Deve 2018-02-28 21:59:08 +01:00
parent 0ee00ad1e5
commit a00c1cadc8
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/gui/multitouch_settings.stkgui
View File

@ -35,7 +35,7 @@
<label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Accelerometer"/>
<div proportion="1" align="center" height="fit" layout="horizontal-row" >
<spacer width="40" height="10" />
<spinner id="accelerometer" proportion="1"/>
<checkbox id="accelerometer"/>
</div>
</div>

14
src/input/input_manager.cpp
View File

@ -1196,17 +1196,9 @@ EventPropagation InputManager::input(const SEvent& event)
float factor = UserConfigParams::m_multitouch_tilt_factor;
factor = std::max(factor, 0.1f);
if (UserConfigParams::m_multitouch_accelerometer == 1)
{
button->axis_x = (float)-event.AccelerometerEvent.X / factor;
device->handleControls(button);
}
else if (UserConfigParams::m_multitouch_accelerometer == 2)
{
button->axis_x = (float)event.AccelerometerEvent.Y / factor;
device->handleControls(button);
}
button->axis_x = (float)event.AccelerometerEvent.Y / factor;
device->handleControls(button);
}
}
}

20
src/states_screens/dialogs/multitouch_settings_dialog.cpp
View File

@ -51,17 +51,6 @@ MultitouchSettingsDialog::~MultitouchSettingsDialog()
void MultitouchSettingsDialog::beforeAddingWidgets()
{
SpinnerWidget* accelerometer = getWidget<SpinnerWidget>("accelerometer");
assert(accelerometer != NULL);
accelerometer->m_properties[PROP_WRAP_AROUND] = "true";
accelerometer->clearLabels();
accelerometer->addLabel(_("Disabled"));
accelerometer->addLabel(_("Tablet"));
accelerometer->addLabel(_("Phone"));
accelerometer->m_properties[GUIEngine::PROP_MIN_VALUE] = "0";
accelerometer->m_properties[GUIEngine::PROP_MAX_VALUE] = "2";
updateValues();
}
@ -94,10 +83,11 @@ GUIEngine::EventPropagation MultitouchSettingsDialog::processEvent(
assert(buttons_inv != NULL);
UserConfigParams::m_multitouch_inverted = buttons_inv->getState();
SpinnerWidget* accelerometer = getWidget<SpinnerWidget>("accelerometer");
CheckBoxWidget* accelerometer = getWidget<CheckBoxWidget>("accelerometer");
assert(accelerometer != NULL);
UserConfigParams::m_multitouch_accelerometer = accelerometer->getValue();
UserConfigParams::m_multitouch_accelerometer = accelerometer->
getState() ? 1 : 0;
MultitouchDevice* touch_device = input_manager->getDeviceManager()->
getMultitouchDevice();
@ -154,9 +144,9 @@ void MultitouchSettingsDialog::updateValues()
assert(buttons_inv != NULL);
buttons_inv->setState(UserConfigParams::m_multitouch_inverted);
SpinnerWidget* accelerometer = getWidget<SpinnerWidget>("accelerometer");
CheckBoxWidget* accelerometer = getWidget<CheckBoxWidget>("accelerometer");
assert(accelerometer != NULL);
accelerometer->setValue(UserConfigParams::m_multitouch_accelerometer);
accelerometer->setState(UserConfigParams::m_multitouch_accelerometer != 0);
}
// -----------------------------------------------------------------------------