Merge pull request #5953 from khg8m3r/OSX

Fixes for OSX hotkey defaults
dolphin-emu · Aug 22, 2017 · 9d93a16 · 9d93a16
2 parents 6e1cdfa + 3d01eee
commit 9d93a16
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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` ))";