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

Fix various keyboard handling on macOS

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

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

@@ -72,7 +72,7 @@ KeyboardKeys GetKey(NSEvent* event)
case 0x30: return KeyboardKeys::Tab; case 0x30: return KeyboardKeys::Tab;
case 0x31: return KeyboardKeys::Spacebar; case 0x31: return KeyboardKeys::Spacebar;
case 0x32: return KeyboardKeys::BackQuote; case 0x32: return KeyboardKeys::BackQuote;
case 0x33: return KeyboardKeys::Delete; case 0x33: return KeyboardKeys::Backspace;
//case 0x34: //case 0x34:
case 0x35: return KeyboardKeys::Escape; case 0x35: return KeyboardKeys::Escape;
case 0x36: return KeyboardKeys::Control; // Command (right) case 0x36: return KeyboardKeys::Control; // Command (right)
@@ -378,7 +378,7 @@ static void ConvertNSRect(NSScreen *screen, NSRect *r)
{ {
KeyboardKeys key = GetKey(event); KeyboardKeys key = GetKey(event);
if (key != KeyboardKeys::None) if (key != KeyboardKeys::None)
Input::Keyboard->OnKeyDown(key); Input::Keyboard->OnKeyDown(key, Window);
// Send a text input event // Send a text input event
switch (key) switch (key)
@@ -400,7 +400,7 @@ static void ConvertNSRect(NSScreen *screen, NSRect *r)
if (length >= 16) if (length >= 16)
length = 15; length = 15;
[text getCharacters:buffer range:NSMakeRange(0, length)]; [text getCharacters:buffer range:NSMakeRange(0, length)];
Input::Keyboard->OnCharInput((Char)buffer[0]); Input::Keyboard->OnCharInput((Char)buffer[0], Window);
} }
} }
@@ -408,7 +408,7 @@ static void ConvertNSRect(NSScreen *screen, NSRect *r)
{ {
KeyboardKeys key = GetKey(event); KeyboardKeys key = GetKey(event);
if (key != KeyboardKeys::None) if (key != KeyboardKeys::None)
Input::Keyboard->OnKeyUp(key); Input::Keyboard->OnKeyUp(key, Window);
} }
- (void)flagsChanged:(NSEvent*)event - (void)flagsChanged:(NSEvent*)event
@@ -430,9 +430,9 @@ static void ConvertNSRect(NSScreen *screen, NSRect *r)
{ {
int32 modifierFlags = [event modifierFlags]; int32 modifierFlags = [event modifierFlags];
if ((modifierFlags & modMask) == modMask) if ((modifierFlags & modMask) == modMask)
Input::Keyboard->OnKeyDown(key); Input::Keyboard->OnKeyDown(key, Window);
else else
Input::Keyboard->OnKeyUp(key); Input::Keyboard->OnKeyUp(key, Window);
} }
} }