ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7746 from Techjar/fix-hotkey-conflicts 

[RFC] Core/HotkeyManager: Fix default hotkey conflicts
This commit is contained in:
Anthony 2019-02-03 12:26:14 -08:00 committed by GitHub
parent 8aaebfa2b3 d70ea9e4ec
commit eee24cd1ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/HotkeyManager.cpp
View File

@ -387,18 +387,18 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
// General hotkeys // General hotkeys
set_key_expression(HK_OPEN, CTRL + " & O"); set_key_expression(HK_OPEN, CTRL + " & O");
set_key_expression(HK_PLAY_PAUSE, "`F10`"); set_key_expression(HK_PLAY_PAUSE, NON + " & `F10`");
#ifdef _WIN32 #ifdef _WIN32
set_key_expression(HK_STOP, "ESCAPE"); set_key_expression(HK_STOP, NON + " & ESCAPE");
set_key_expression(HK_FULLSCREEN, ALT + " & RETURN"); set_key_expression(HK_FULLSCREEN, ALT + " & RETURN");
#else #else
set_key_expression(HK_STOP, "Escape"); set_key_expression(HK_STOP, NON + " & Escape");
set_key_expression(HK_FULLSCREEN, ALT + " & Return"); set_key_expression(HK_FULLSCREEN, ALT + " & Return");
#endif #endif
set_key_expression(HK_STEP, NON + " & `F11`"); set_key_expression(HK_STEP, NON + " & `F11`");
set_key_expression(HK_STEP_OVER, NON + " & `F10`"); set_key_expression(HK_STEP_OVER, SHIFT + " & `F10`");
set_key_expression(HK_STEP_OUT, SHIFT + " & `F11`"); set_key_expression(HK_STEP_OUT, SHIFT + " & `F11`");
set_key_expression(HK_BP_TOGGLE, NON + " & `F9`"); set_key_expression(HK_BP_TOGGLE, SHIFT + " & `F9`");
set_key_expression(HK_SCREENSHOT, NON + " & `F9`"); set_key_expression(HK_SCREENSHOT, NON + " & `F9`");
set_key_expression(HK_WIIMOTE1_CONNECT, ALT + " & `F5`"); set_key_expression(HK_WIIMOTE1_CONNECT, ALT + " & `F5`");
set_key_expression(HK_WIIMOTE2_CONNECT, ALT + " & `F6`"); set_key_expression(HK_WIIMOTE2_CONNECT, ALT + " & `F6`");
@ -406,9 +406,9 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
set_key_expression(HK_WIIMOTE4_CONNECT, ALT + " & `F8`"); set_key_expression(HK_WIIMOTE4_CONNECT, ALT + " & `F8`");
set_key_expression(HK_BALANCEBOARD_CONNECT, ALT + " & `F9`"); set_key_expression(HK_BALANCEBOARD_CONNECT, ALT + " & `F9`");
#ifdef _WIN32 #ifdef _WIN32
set_key_expression(HK_TOGGLE_THROTTLE, "TAB"); set_key_expression(HK_TOGGLE_THROTTLE, NON + " & TAB");
#else #else
set_key_expression(HK_TOGGLE_THROTTLE, "Tab"); set_key_expression(HK_TOGGLE_THROTTLE, NON + " & Tab");
#endif #endif
// Freelook // Freelook