Merge pull request #3592 from nicktiberi/master

Normalize and check upper/lower bounds of hats input on OS X

Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm

@@ -227,11 +227,21 @@
 ControlState Joystick::Hat::GetState() const
 {
 	IOHIDValueRef value;
-	int position;
 
 	if (IOHIDDeviceGetValue(m_device, m_element, &value) == kIOReturnSuccess)
 	{
-		position = IOHIDValueGetIntegerValue(value);
+		int position = IOHIDValueGetIntegerValue(value);
+		int min = IOHIDElementGetLogicalMin(m_element);
+		int max = IOHIDElementGetLogicalMax(m_element);
+
+		// if the position is outside the min or max, don't register it as a valid button press
+		if (position < min || position > max)
+		{
+			return 0;
+		}
+
+		// normalize the position so that its lowest value is 0
+		position -= min;
 
 		switch (position)
 		{