Skip to content

Commit

Permalink
InputCommon: Change default hotkey for home and start.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
degasus committed May 31, 2015
1 parent 31f22e6 commit db30b39
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Source/Core/Core/HW/GCPadEmu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 %
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit db30b39

Please sign in to comment.