From 42e73547eb9135ca9a93399e7300f49a5a0620f1 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 11 Jun 2024 19:13:54 -0500 Subject: ControllerInterface: Adjust sort priorities to ensure default keyboard-mouse device is first. --- .../InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h | 1 + .../InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'Source/Core/InputCommon/ControllerInterface/Quartz') diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h index 07292f9039..7f526a07dd 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h @@ -69,6 +69,7 @@ public: std::string GetName() const override; std::string GetSource() const override; + int GetSortPriority() const override; private: void MainThreadInitialization(void* view); diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm index 55f212900d..f36cc86245 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm @@ -283,6 +283,11 @@ std::string KeyboardAndMouse::GetSource() const return Quartz::GetSourceName(); } +int KeyboardAndMouse::GetSortPriority() const +{ + return DEFAULT_DEVICE_SORT_PRIORITY; +} + ControlState KeyboardAndMouse::Cursor::GetState() const { return std::max(0.0, ControlState(m_axis) / (m_positive ? 1.0 : -1.0)); -- cgit v1.2.3