diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-11-20 09:48:26 -0500 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-11-20 22:22:22 -0500 |
| commit | 102630f2b29b654146a50c8075316eefadbff763 (patch) | |
| tree | eaed21a057336adc5d5aeaae136593c58bc74cf3 /src/yuzu/configuration/configure_input_player.h | |
| parent | d88baa746bc10df1afadd90f5149a29abc3e4ace (diff) | |
configure_input_player: Use the npad style set to show the available controllers
This will reduce the likelihood of an invalid controller type to be set within a game
Diffstat (limited to 'src/yuzu/configuration/configure_input_player.h')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index 23cf6f958..9c30879a2 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h @@ -9,6 +9,7 @@ #include <memory> #include <optional> #include <string> +#include <vector> #include <QWidget> @@ -112,6 +113,15 @@ private: /// Update UI to reflect current configuration. void UpdateUI(); + /// Sets the available controllers. + void SetConnectableControllers(); + + /// Gets the Controller Type for a given controller combobox index. + Settings::ControllerType GetControllerTypeFromIndex(int index) const; + + /// Gets the controller combobox index for a given Controller Type. + int GetIndexFromControllerType(Settings::ControllerType type) const; + /// Update the available input devices. void UpdateInputDevices(); @@ -151,6 +161,9 @@ private: std::unique_ptr<QTimer> timeout_timer; std::unique_ptr<QTimer> poll_timer; + /// Stores a pair of "Connected Controllers" combobox index and Controller Type enum. + std::vector<std::pair<int, Settings::ControllerType>> index_controller_type_pairs; + static constexpr int PLAYER_COUNT = 8; std::array<QCheckBox*, PLAYER_COUNT> player_connected_checkbox; |
