summaryrefslogtreecommitdiffstats
path: root/src/yuzu/configuration/configure_input_player.h
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-10-20 20:23:25 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-10-20 20:23:25 +0200
commitff82f3894a373cc636ce79f3fdd7b7b0af7da852 (patch)
tree7aeea49ba16d7b085dbd3e5537a16414231b9cdf /src/yuzu/configuration/configure_input_player.h
parentMerge pull request #4788 from ReinUsesLisp/lockfree-host-thread (diff)
downloadyuzu-ff82f3894a373cc636ce79f3fdd7b7b0af7da852.tar
yuzu-ff82f3894a373cc636ce79f3fdd7b7b0af7da852.tar.gz
yuzu-ff82f3894a373cc636ce79f3fdd7b7b0af7da852.tar.bz2
yuzu-ff82f3894a373cc636ce79f3fdd7b7b0af7da852.tar.lz
yuzu-ff82f3894a373cc636ce79f3fdd7b7b0af7da852.tar.xz
yuzu-ff82f3894a373cc636ce79f3fdd7b7b0af7da852.tar.zst
yuzu-ff82f3894a373cc636ce79f3fdd7b7b0af7da852.zip
Diffstat (limited to '')
-rw-r--r--src/yuzu/configuration/configure_input_player.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h
index ce443dec5..c19aefffa 100644
--- a/src/yuzu/configuration/configure_input_player.h
+++ b/src/yuzu/configuration/configure_input_player.h
@@ -131,26 +131,25 @@ private:
std::array<Common::ParamPackage, Settings::NativeButton::NumButtons> buttons_param;
std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> analogs_param;
- std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> stick_mod_param;
std::array<Common::ParamPackage, Settings::NativeMotion::NumMotions> motions_param;
static constexpr int ANALOG_SUB_BUTTONS_NUM = 4;
/// Each button input is represented by a QPushButton.
std::array<QPushButton*, Settings::NativeButton::NumButtons> button_map;
- /// Each motion input is represented by a QPushButton.
- std::array<QPushButton*, Settings::NativeMotion::NumMotions> motion_map;
- /// Extra buttons for the modifiers.
- std::array<QPushButton*, Settings::NativeAnalog::NumAnalogs> mod_buttons;
/// A group of four QPushButtons represent one analog input. The buttons each represent up,
/// down, left, right, respectively.
std::array<std::array<QPushButton*, ANALOG_SUB_BUTTONS_NUM>, Settings::NativeAnalog::NumAnalogs>
analog_map_buttons;
+ /// Each motion input is represented by a QPushButton.
+ std::array<QPushButton*, Settings::NativeMotion::NumMotions> motion_map;
+
std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_label;
std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_slider;
std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_groupbox;
+ std::array<QPushButton*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_button;
std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_label;
std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_slider;
std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_range_groupbox;