mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Improved OSX realtime key modifier flag detection.

Browse source
This commit is contained in:
jules 2011-11-20 10:47:21 +00:00
parent 65562fdbdb
commit 2ae2f8da30
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
View file

@ -227,6 +227,7 @@ public:
static void showArrowCursorIfNeeded();
static void updateModifiers (NSEvent* e);
static void updateModifiers (NSUInteger);
static void updateKeysDown (NSEvent* ev, bool isKeyDown);
static int getKeyCodeFromEvent (NSEvent* ev)
@ -918,18 +919,23 @@ bool KeyPress::isKeyCurrentlyDown (const int keyCode)
return false;
}
void NSViewComponentPeer::updateModifiers (NSEvent* e)
void NSViewComponentPeer::updateModifiers (const NSUInteger flags)
{
int m = 0;
if (([e modifierFlags] & NSShiftKeyMask) != 0) m |= ModifierKeys::shiftModifier;
if (([e modifierFlags] & NSControlKeyMask) != 0) m |= ModifierKeys::ctrlModifier;
if (([e modifierFlags] & NSAlternateKeyMask) != 0) m |= ModifierKeys::altModifier;
if (([e modifierFlags] & NSCommandKeyMask) != 0) m |= ModifierKeys::commandModifier;
if ((flags & NSShiftKeyMask) != 0) m |= ModifierKeys::shiftModifier;
if ((flags & NSControlKeyMask) != 0) m |= ModifierKeys::ctrlModifier;
if ((flags & NSAlternateKeyMask) != 0) m |= ModifierKeys::altModifier;
if ((flags & NSCommandKeyMask) != 0) m |= ModifierKeys::commandModifier;
currentModifiers = currentModifiers.withOnlyMouseButtons().withFlags (m);
}
void NSViewComponentPeer::updateModifiers (NSEvent* e)
{
updateModifiers ([e modifierFlags]);
}
void NSViewComponentPeer::updateKeysDown (NSEvent* ev, bool isKeyDown)
{
updateModifiers (ev);
@ -946,6 +952,7 @@ void NSViewComponentPeer::updateKeysDown (NSEvent* ev, bool isKeyDown)
ModifierKeys ModifierKeys::getCurrentModifiersRealtime() noexcept
{
NSViewComponentPeer::updateModifiers ([NSEvent modifierFlags]);
return NSViewComponentPeer::currentModifiers;
}