diff options
| author | degasus <wickmarkus@web.de> | 2015-05-31 01:50:11 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2015-05-31 10:30:09 +0200 |
| commit | bdfea961231a1e44832c63598f8972c208bd00dc (patch) | |
| tree | f0c43ae1ff08c4040645032e08d51a3caa7dd2fc /Source/Core | |
| parent | ef3ed682a191886735aeed2fe7003c258998c3f4 (diff) | |
InputCommon: Change default hotkey for home and start.
We already use ALT + ENTER for toggling fullscreen.
But as ENTER is both home and start, this buttons will always
also be triggered on toggling fullscreen. Now we check for
those buttons if ALT is not pressed.
So now we're able to toggle fullscreen without pressing home or start.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/GCPadEmu.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp index 18a9841cc7..0190a38d09 100644 --- a/Source/Core/Core/HW/GCPadEmu.cpp +++ b/Source/Core/Core/HW/GCPadEmu.cpp @@ -138,10 +138,10 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface) set_control(m_buttons, 3, "S"); // Y set_control(m_buttons, 4, "D"); // Z #ifdef _WIN32 - set_control(m_buttons, 5, "RETURN"); // Start + set_control(m_buttons, 5, "!LMENU & RETURN"); // Start #else // OS X/Linux - set_control(m_buttons, 5, "Return"); // Start + set_control(m_buttons, 5, "!`Alt_L` & Return"); // Start #endif // stick modifiers to 50 % diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index 5fcfb3ef84..80a01360bf 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -895,9 +895,9 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface) set_control(m_buttons, 5, "E"); // + #ifdef _WIN32 - set_control(m_buttons, 6, "RETURN"); // Home + set_control(m_buttons, 6, "!LMENU & RETURN"); // Home #else - set_control(m_buttons, 6, "Return"); // Home + set_control(m_buttons, 6, "!`Alt_L` & Return"); // Home #endif // Shake |