diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-21 13:38:10 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-21 13:38:10 -0600 |
| commit | b8b537d96e671985ef3dc53bc2d1f244deba7e1c (patch) | |
| tree | 8ee8d7d9a1f0676d37d958791776f268323e18f7 /Source/Core/DolphinWX/Frame.cpp | |
| parent | a5e9c5e7183d5b7dd7944fb5ea69974e38c8c46d (diff) | |
| parent | a25b07ec56fdac4ab635f93a61142529774baf75 (diff) | |
Merge pull request #1934 from Buddybenj/change-order
Change Order of Some Hotkeys
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index d90db5a28d..f4c19e5a57 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1066,10 +1066,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) Core::SaveScreenShot(); else if (IsHotkey(event, HK_EXIT)) wxPostEvent(this, wxCommandEvent(wxID_EXIT)); - else if (IsHotkey(event, HK_VOLUME_UP)) - AudioCommon::IncreaseVolume(3); else if (IsHotkey(event, HK_VOLUME_DOWN)) AudioCommon::DecreaseVolume(3); + else if (IsHotkey(event, HK_VOLUME_UP)) + AudioCommon::IncreaseVolume(3); else if (IsHotkey(event, HK_VOLUME_TOGGLE_MUTE)) AudioCommon::ToggleMuteVolume(); // Wiimote connect and disconnect hotkeys @@ -1118,16 +1118,16 @@ void CFrame::OnKeyDown(wxKeyEvent& event) { Core::SetIsFramelimiterTempDisabled(true); } - else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) - { - if (++SConfig::GetInstance().m_Framelimit > 0x19) - SConfig::GetInstance().m_Framelimit = 0; - } else if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT)) { if (--SConfig::GetInstance().m_Framelimit > 0x19) SConfig::GetInstance().m_Framelimit = 0x19; } + else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) + { + if (++SConfig::GetInstance().m_Framelimit > 0x19) + SConfig::GetInstance().m_Framelimit = 0; + } else if (IsHotkey(event, HK_SAVE_STATE_SLOT_SELECTED)) { State::Save(g_saveSlot); @@ -1136,26 +1136,26 @@ void CFrame::OnKeyDown(wxKeyEvent& event) { State::Load(g_saveSlot); } - else if (IsHotkey(event, HK_INCREASE_DEPTH)) - { - if (++g_Config.iStereoDepth > 100) - g_Config.iStereoDepth = 100; - } else if (IsHotkey(event, HK_DECREASE_DEPTH)) { if (--g_Config.iStereoDepth < 0) g_Config.iStereoDepth = 0; } - else if (IsHotkey(event, HK_INCREASE_CONVERGENCE)) + else if (IsHotkey(event, HK_INCREASE_DEPTH)) { - if (++g_Config.iStereoConvergence > 500) - g_Config.iStereoConvergence = 500; + if (++g_Config.iStereoDepth > 100) + g_Config.iStereoDepth = 100; } else if (IsHotkey(event, HK_DECREASE_CONVERGENCE)) { if (--g_Config.iStereoConvergence < 0) g_Config.iStereoConvergence = 0; } + else if (IsHotkey(event, HK_INCREASE_CONVERGENCE)) + { + if (++g_Config.iStereoConvergence > 500) + g_Config.iStereoConvergence = 500; + } else { |