From a25b07ec56fdac4ab635f93a61142529774baf75 Mon Sep 17 00:00:00 2001 From: Benjamin Przybocki Date: Tue, 20 Jan 2015 17:57:42 -0600 Subject: Change Order of Some Hotkeys --- Source/Core/DolphinWX/Frame.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 214da46b02..ae0f37fe94 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1061,10 +1061,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 @@ -1113,16 +1113,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); @@ -1131,26 +1131,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 { -- cgit v1.2.3