GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add control/command/option keys handling on macOS

Browse Source
This commit is contained in:
Wojtek Figat
2023-07-15 15:00:55 +02:00
parent 6fc168bdf1
commit 6853aa6e81
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Engine/Platform/Mac/MacWindow.cpp
View File

@@ -75,8 +75,8 @@ KeyboardKeys GetKey(NSEvent* event)
case 0x33: return KeyboardKeys::Delete;
//case 0x34:
case 0x35: return KeyboardKeys::Escape;
//case 0x36:
//case 0x37: Command
case 0x36: return KeyboardKeys::Control; // Command (right)
case 0x37: return KeyboardKeys::Control; // Command (left)
case 0x38: return KeyboardKeys::Shift;
case 0x39: return KeyboardKeys::Capital;
case 0x3A: return KeyboardKeys::Alt;
@@ -411,6 +411,31 @@ static void ConvertNSRect(NSScreen *screen, NSRect *r)
Input::Keyboard->OnKeyUp(key);
}
- (void)flagsChanged:(NSEvent*)event
{
int32 modMask;
int32 keyCode = [event keyCode];
if (keyCode == 0x36 || keyCode == 0x37)
modMask = NSEventModifierFlagCommand;
else if (keyCode == 0x38 || keyCode == 0x3c)
modMask = NSEventModifierFlagShift;
else if (keyCode == 0x3a || keyCode == 0x3d)
modMask = NSEventModifierFlagOption;
else if (keyCode == 0x3b || keyCode == 0x3e)
modMask = NSEventModifierFlagControl;
else
return;
KeyboardKeys key = GetKey(event);
if (key != KeyboardKeys::None)
{
int32 modifierFlags = [event modifierFlags];
if ((modifierFlags & modMask) == modMask)
Input::Keyboard->OnKeyDown(key);
else
Input::Keyboard->OnKeyUp(key);
}
}
- (void)scrollWheel:(NSEvent*)event
{
Float2 mousePos = GetMousePosition(Window, event);