diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2022-03-02 15:40:20 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2022-04-03 19:03:44 -0500 |
| commit | 566dfc1cf489921e52dc4cb1914021850b1f71ae (patch) | |
| tree | 255f658fa6093a39ee73a1c7d609d4260260276a /Source/Core/InputCommon/ControllerInterface | |
| parent | 076a262b9e936860411213f3d2e2d2de97664c88 (diff) | |
ControllerInterface: Update sort priorities.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
5 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index b80b84d416..f69b95293c 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -64,7 +64,7 @@ public: std::string GetName() const override; std::string GetSource() const override; - int GetSortPriority() const override { return -2; } + int GetSortPriority() const override { return -3; } bool IsValid() const final override; diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp index a16f9cfc23..15b0915381 100644 --- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp @@ -136,7 +136,7 @@ public: std::string GetSource() const final override; std::optional<int> GetPreferredId() const final override; // Always add these at the end, given their hotplug nature - int GetSortPriority() const override { return -4; } + int GetSortPriority() const override { return -5; } private: void ResetPadData(); diff --git a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp index 231af03d46..1fac7866f4 100644 --- a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp @@ -172,6 +172,8 @@ public: } } + int GetSortPriority() const override { return -1; } + private: // `boolean` comes from Windows API. (typedef of unsigned char) using ButtonValueType = boolean; diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp index 2cf459ca11..6ab4e599cb 100644 --- a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp @@ -323,7 +323,7 @@ std::string Device::GetSource() const // Always add these at the end, given their hotplug nature int Device::GetSortPriority() const { - return -3; + return -4; } void Device::RunTasks() diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index d2e1898c5a..1673f795ed 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -31,7 +31,7 @@ public: std::string GetName() const override; std::string GetSource() const override; std::optional<int> GetPreferredId() const override; - int GetSortPriority() const override { return -1; } + int GetSortPriority() const override { return -2; } void UpdateInput() override; |
