diff options
| author | Nick <nick@nicks-imac.attlocal.net> | 2017-08-20 19:57:38 -0400 |
|---|---|---|
| committer | Léo Lam <leo@innovatetechnologi.es> | 2017-08-22 21:31:19 +0200 |
| commit | 3d01eeef00d59617f6c0257691fe79684e5294bb (patch) | |
| tree | 81b0f167b55cbf5b7b44b21b7449c62753aa6b0a /Source | |
| parent | 6e1cdfadc94a22f28908d39d066a651ae2d5db9b (diff) | |
Fix OSX hotkey defaults
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HotkeyManager.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 4753170fa4..b9dab79224 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -325,6 +325,15 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface) const std::string ALT = "((LMENU | RMENU) & !(LSHIFT | RSHIFT) & !(LCONTROL | RCONTROL))"; const std::string SHIFT = "(!(LMENU | RMENU) & (LSHIFT | RSHIFT) & !(LCONTROL | RCONTROL))"; const std::string CTRL = "(!(LMENU | RMENU) & !(LSHIFT | RSHIFT) & (LCONTROL | RCONTROL))"; +#elif __APPLE__ + const std::string NON = + "(!`Left Alt` & !(`Left Shift`| `Right Shift`) & !(`Left Control` | `Right Control`))"; + const std::string ALT = + "(`Left Alt` & !(`Left Shift`| `Right Shift`) & !(`Left Control` | `Right Control`))"; + const std::string SHIFT = + "(!`Left Alt` & (`Left Shift`| `Right Shift`) & !(`Left Control` | `Right Control`))"; + const std::string CTRL = + "(!`Left Alt` & !(`Left Shift`| `Right Shift`) & (`Left Control` | `Right Control`))"; #else const std::string NON = "(!`Alt_L` & !(`Shift_L` | `Shift_R`) & !(`Control_L` | `Control_R` ))"; const std::string ALT = "(`Alt_L` & !(`Shift_L` | `Shift_R`) & !(`Control_L` | `Control_R` ))"; |