From 3dc8136e1445244d8c7181d0bbb65e223728dd70 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Mon, 8 Aug 2016 09:38:22 -0700 Subject: Add Quartz/CoreGraphics controller interface for default k&m events --- Source/Core/InputCommon/InputConfig.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/InputConfig.cpp') diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index e1869ca465..9df0b71e62 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -126,7 +126,8 @@ bool InputConfig::IsControllerControlledByGamepadDevice(int index) const const auto& controller = m_controllers.at(index).get()->default_device; // Filter out anything which obviously not a gamepad - return !((controller.source == "Keyboard") // OSX Keyboard/Mouse + return !((controller.source == "Keyboard") // OSX IOKit Keyboard/Mouse + || (controller.source == "Quartz") // OSX Quartz Keyboard/Mouse || (controller.source == "XInput2") // Linux and BSD Keyboard/Mouse || (controller.source == "Android" && controller.name == "Touchscreen") // Android Touchscreen -- cgit v1.2.3