mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-05 15:48:51 +00:00
Merge pull request #10446 from AdmiralCurtiss/unbreak-shift
HotkeyManager: Change defaults for GBA hotkeys so they don't conflict with common keyboard mappings.
This commit is contained in:
commit
92455f7cef
1 changed files with 3 additions and 3 deletions
|
@ -463,9 +463,9 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
|
||||||
set_key_expression(HK_UNDO_SAVE_STATE, hotkey_string({"Shift", "F12"}));
|
set_key_expression(HK_UNDO_SAVE_STATE, hotkey_string({"Shift", "F12"}));
|
||||||
|
|
||||||
// GBA
|
// GBA
|
||||||
set_key_expression(HK_GBA_LOAD, hotkey_string({"`Shift`", "`O`"}));
|
set_key_expression(HK_GBA_LOAD, hotkey_string({"`Ctrl`", "`Shift`", "`O`"}));
|
||||||
set_key_expression(HK_GBA_UNLOAD, hotkey_string({"`Shift`", "`W`"}));
|
set_key_expression(HK_GBA_UNLOAD, hotkey_string({"`Ctrl`", "`Shift`", "`W`"}));
|
||||||
set_key_expression(HK_GBA_RESET, hotkey_string({"`Shift`", "`R`"}));
|
set_key_expression(HK_GBA_RESET, hotkey_string({"`Ctrl`", "`Shift`", "`R`"}));
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
set_key_expression(HK_GBA_VOLUME_DOWN, "`SUBTRACT`");
|
set_key_expression(HK_GBA_VOLUME_DOWN, "`SUBTRACT`");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue