mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'use_command_keys' into 'master'

Browse Source 
Remove special handling for Mac command key, since MyGUI now switches automatically

See merge request OpenMW/openmw!3363
This commit is contained in:
psi29a 2023-08-21 09:27:42 +00:00
commit 1c2f92cac9
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/sdlutil/sdlmappings.cpp
View File

@ -199,20 +199,10 @@ namespace SDLUtil
keyMap[SDLK_INSERT] = MyGUI::KeyCode::Insert; keyMap[SDLK_INSERT] = MyGUI::KeyCode::Insert;
keyMap[SDLK_DELETE] = MyGUI::KeyCode::Delete; keyMap[SDLK_DELETE] = MyGUI::KeyCode::Delete;
keyMap[SDLK_APPLICATION] = MyGUI::KeyCode::AppMenu; keyMap[SDLK_APPLICATION] = MyGUI::KeyCode::AppMenu;
// The function of the Ctrl and Meta keys are switched on macOS compared to other platforms.
// For instance] = Cmd+C versus Ctrl+C to copy from the system clipboard
#if defined(__APPLE__)
keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftControl;
keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightControl;
keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftWindows;
keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightWindows;
#else
keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftWindows; keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftWindows;
keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightWindows; keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightWindows;
keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftControl; keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftControl;
keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightControl; keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightControl;
#endif
return keyMap; return keyMap;
} }