diff options
| -rw-r--r-- | src/yuzu/configuration/configure_input_player_widget.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_input_player_widget.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index e77ccc057..416e4d168 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp | |||
| @@ -37,7 +37,8 @@ void PlayerControlPreview::SetPlayerInput(std::size_t index, const ButtonParam& | |||
| 37 | Input::CreateDevice<Input::AnalogDevice>); | 37 | Input::CreateDevice<Input::AnalogDevice>); |
| 38 | UpdateColors(); | 38 | UpdateColors(); |
| 39 | } | 39 | } |
| 40 | void PlayerControlPreview::SetPlayerInputRaw(std::size_t index, const Settings::ButtonsRaw buttons_, | 40 | void PlayerControlPreview::SetPlayerInputRaw(std::size_t index, |
| 41 | const Settings::ButtonsRaw& buttons_, | ||
| 41 | Settings::AnalogsRaw analogs_) { | 42 | Settings::AnalogsRaw analogs_) { |
| 42 | player_index = index; | 43 | player_index = index; |
| 43 | std::transform(buttons_.begin() + Settings::NativeButton::BUTTON_HID_BEGIN, | 44 | std::transform(buttons_.begin() + Settings::NativeButton::BUTTON_HID_BEGIN, |
| @@ -2323,7 +2324,7 @@ void PlayerControlPreview::DrawGCJoystick(QPainter& p, const QPointF center, boo | |||
| 2323 | } | 2324 | } |
| 2324 | 2325 | ||
| 2325 | void PlayerControlPreview::DrawRawJoystick(QPainter& p, const QPointF center, const QPointF value, | 2326 | void PlayerControlPreview::DrawRawJoystick(QPainter& p, const QPointF center, const QPointF value, |
| 2326 | const Input::AnalogProperties properties) { | 2327 | const Input::AnalogProperties& properties) { |
| 2327 | constexpr float size = 45.0f; | 2328 | constexpr float size = 45.0f; |
| 2328 | const float range = size * properties.range; | 2329 | const float range = size * properties.range; |
| 2329 | const float deadzone = size * properties.deadzone; | 2330 | const float deadzone = size * properties.deadzone; |
diff --git a/src/yuzu/configuration/configure_input_player_widget.h b/src/yuzu/configuration/configure_input_player_widget.h index 676effbfd..91c3343f1 100644 --- a/src/yuzu/configuration/configure_input_player_widget.h +++ b/src/yuzu/configuration/configure_input_player_widget.h | |||
| @@ -25,7 +25,7 @@ public: | |||
| 25 | 25 | ||
| 26 | void SetPlayerInput(std::size_t index, const ButtonParam& buttons_param, | 26 | void SetPlayerInput(std::size_t index, const ButtonParam& buttons_param, |
| 27 | const AnalogParam& analogs_param); | 27 | const AnalogParam& analogs_param); |
| 28 | void SetPlayerInputRaw(std::size_t index, const Settings::ButtonsRaw buttons_, | 28 | void SetPlayerInputRaw(std::size_t index, const Settings::ButtonsRaw& buttons_, |
| 29 | Settings::AnalogsRaw analogs_); | 29 | Settings::AnalogsRaw analogs_); |
| 30 | void SetConnectedStatus(bool checked); | 30 | void SetConnectedStatus(bool checked); |
| 31 | void SetControllerType(Settings::ControllerType type); | 31 | void SetControllerType(Settings::ControllerType type); |
| @@ -138,8 +138,8 @@ private: | |||
| 138 | // Draw joystick functions | 138 | // Draw joystick functions |
| 139 | void DrawJoystick(QPainter& p, QPointF center, float size, bool pressed); | 139 | void DrawJoystick(QPainter& p, QPointF center, float size, bool pressed); |
| 140 | void DrawJoystickSideview(QPainter& p, QPointF center, float angle, float size, bool pressed); | 140 | void DrawJoystickSideview(QPainter& p, QPointF center, float angle, float size, bool pressed); |
| 141 | void DrawRawJoystick(QPainter& p, QPointF center, const QPointF value, | 141 | void DrawRawJoystick(QPainter& p, QPointF center, QPointF value, |
| 142 | const Input::AnalogProperties properties); | 142 | const Input::AnalogProperties& properties); |
| 143 | void DrawProJoystick(QPainter& p, QPointF center, QPointF offset, float scalar, bool pressed); | 143 | void DrawProJoystick(QPainter& p, QPointF center, QPointF offset, float scalar, bool pressed); |
| 144 | void DrawGCJoystick(QPainter& p, QPointF center, bool pressed); | 144 | void DrawGCJoystick(QPainter& p, QPointF center, bool pressed); |
| 145 | 145 | ||