From 8483811b398f9156a08565825cbf138cb3697039 Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 16 Feb 2014 23:13:01 +0100 Subject: Add a hotkey for disabling the framelimit. Atm this is hardcoded to '\t'. --- Source/Core/DolphinWX/Frame.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 87fb799616..191d5c0086 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -940,6 +940,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) OSDChoice = 4; g_Config.bDisableFog = !g_Config.bDisableFog; } + else if (IsHotkey(event, HK_TOGGLE_THROTTLE)) + { + Core::IsFramelimiterTempDisabled = true; + } else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) { if (++SConfig::GetInstance().m_Framelimit > 0x19) @@ -1040,7 +1044,18 @@ void CFrame::OnKeyDown(wxKeyEvent& event) void CFrame::OnKeyUp(wxKeyEvent& event) { - event.Skip(); + if(Core::GetState() != Core::CORE_UNINITIALIZED && + (RendererHasFocus() || TASInputHasFocus())) + { + if (IsHotkey(event, HK_TOGGLE_THROTTLE)) + { + Core::IsFramelimiterTempDisabled = false; + } + } + else + { + event.Skip(); + } } void CFrame::OnMouse(wxMouseEvent& event) -- cgit v1.2.3 From 30586f4d29537835b4a06b52e3c6f23a9e8c2c29 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 30 Apr 2014 12:50:29 +0200 Subject: Add set/get functions for IsFramelimiterTempDisabled --- Source/Core/DolphinWX/Frame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 191d5c0086..26627d2340 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -942,7 +942,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event) } else if (IsHotkey(event, HK_TOGGLE_THROTTLE)) { - Core::IsFramelimiterTempDisabled = true; + Core::SetIsFramelimiterTempDisabled(true); } else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) { @@ -1049,7 +1049,7 @@ void CFrame::OnKeyUp(wxKeyEvent& event) { if (IsHotkey(event, HK_TOGGLE_THROTTLE)) { - Core::IsFramelimiterTempDisabled = false; + Core::SetIsFramelimiterTempDisabled(false); } } else -- cgit v1.2.3