From 65d9def873bdc9a7b3e78949a432467bda5a8465 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Tue, 1 Sep 2020 10:02:18 -0400 Subject: configure_input_player: Re-add "Clear" context menu option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The context menu was removed in Mjölnir Part 1 as part of the input rewrite as we were unaware of it's usage statistics. However, as this was the only way to clear the inputs of individual buttons, this PR will re-add it back in. --- src/yuzu/configuration/configure_input_player.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/yuzu/configuration/configure_input_player.h') diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index b343f2c1d..ce443dec5 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h @@ -131,6 +131,7 @@ private: std::array buttons_param; std::array analogs_param; + std::array stick_mod_param; std::array motions_param; static constexpr int ANALOG_SUB_BUTTONS_NUM = 4; @@ -140,8 +141,7 @@ private: /// Each motion input is represented by a QPushButton. std::array motion_map; /// Extra buttons for the modifiers. - Common::ParamPackage lstick_mod; - Common::ParamPackage rstick_mod; + std::array mod_buttons; /// A group of four QPushButtons represent one analog input. The buttons each represent up, /// down, left, right, respectively. -- cgit v1.2.3