summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/OSX
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-02-16 19:12:42 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2014-02-16 19:12:42 -0600
commit6b5f6ddaa120beaf619e8efc6982c922fc7dc37d (patch)
tree4b487d028eded527d60320b7408143d2c6e9e5ac /Source/Core/InputCommon/ControllerInterface/OSX
parent2b4464f8ddf71d9d908ef5b6c9808cdec6480d57 (diff)
parent6c4ee1753aa2b9e620138801b479365b0569317c (diff)
Merge pull request #82 from lioncash/vertical-alignment
Fix some vertical alignments
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/OSX')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h22
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm4
2 files changed, 14 insertions, 12 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
index b18113bc38..170e4ae9f2 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
@@ -23,10 +23,11 @@ private:
Key(IOHIDElementRef element, IOHIDDeviceRef device);
ControlState GetState() const;
private:
- const IOHIDElementRef m_element;
- const IOHIDDeviceRef m_device;
- std::string m_name;
+ const IOHIDElementRef m_element;
+ const IOHIDDeviceRef m_device;
+ std::string m_name;
};
+
class Cursor : public Input
{
public:
@@ -36,9 +37,10 @@ private:
ControlState GetState() const;
private:
const float& m_axis;
- const u8 m_index;
- const bool m_positive;
+ const u8 m_index;
+ const bool m_positive;
};
+
class Button : public Input
{
public:
@@ -66,11 +68,11 @@ private:
float x, y;
} m_cursor;
- const IOHIDDeviceRef m_device;
- const std::string m_device_name;
- int m_index;
- uint32_t m_windowid;
- unsigned char m_mousebuttons[3];
+ const IOHIDDeviceRef m_device;
+ const std::string m_device_name;
+ int m_index;
+ uint32_t m_windowid;
+ unsigned char m_mousebuttons[3];
};
}
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
index 9fb832c340..101971dab6 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
@@ -117,8 +117,8 @@ Keyboard::Key::Key(IOHIDElementRef element, IOHIDDeviceRef device)
, m_device(device)
{
static const struct PrettyKeys {
- const uint32_t code;
- const char *const name;
+ const uint32_t code;
+ const char *const name;
} named_keys[] = {
{ kHIDUsage_KeyboardA, "A" },
{ kHIDUsage_KeyboardB, "B" },