CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow input configuration with SDL joysticks (#3116)

Browse Source 
* Add infrastructure to poll joystick input and get ParamPackages

* Generalize the callbacks in configure_input.cpp and add buttons for analog sticks

* Use the polling classes in the input dialog

* Fix includes

* Formatting fix

* Include real header instead of forward declaring, to fix compiler error

* Split up pair and add deadzone for joystick configuration

* Pass ParamPackages by reference to callback

* fix formatting

* getPollers -> GetPollers

* Add forward declarations and simplify code a bit

* Update joysticks before opening them

* Fix mixup between joystick IDs and device indices
This commit is contained in:
muemart
2017-12-06 05:26:29 +01:00
committed by bunnei
parent e165b5bb94
commit e784434a25
7 changed files with 385 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/citra_qt/configuration/configure_input.ui
View File

@@ -289,6 +289,13 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="2" column="0" colspan="2">
<widget class="QPushButton" name="buttonCircleAnalog">
<property name="text">
<string>Set Analog Stick</string>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_17">
<item>
@@ -448,6 +455,13 @@
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<widget class="QPushButton" name="buttonCStickAnalog">
<property name="text">
<string>Set Analog Stick</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>