diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-06-15 21:12:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-15 21:12:08 +0200 |
| commit | ed4a09fa56db3fb466e932c369fca0717d867472 (patch) | |
| tree | 96661f8e73f548b6497a88d2f3bf622976c2d82f /Source/Core/InputCommon/ControllerInterface/Xlib | |
| parent | 56fd9c177c0c907a342eedf0a91df089b8f0eea1 (diff) | |
| parent | 42e73547eb9135ca9a93399e7300f49a5a0620f1 (diff) | |
Merge pull request #12850 from jordan-woyak/device-sorting
ControllerInterface: Adjust sort priorities to ensure default keyboard-mouse device is first.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index 057d774c5b..6bed306dca 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -421,6 +421,11 @@ std::string KeyboardMouse::GetSource() const return std::string(SOURCE_NAME); } +int KeyboardMouse::GetSortPriority() const +{ + return DEFAULT_DEVICE_SORT_PRIORITY; +} + KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard) : m_display(display), m_keyboard(keyboard), m_keycode(keycode) { diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 427c81b18a..f6fc108e10 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -120,6 +120,7 @@ public: std::string GetName() const override; std::string GetSource() const override; + int GetSortPriority() const override; private: Window m_window; |