diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-06-19 04:58:04 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-06-19 05:10:40 -0400 |
| commit | 458378528b72bf7696eb075ecfa8d9387b0f0597 (patch) | |
| tree | 28cf56b86666f081a49d1e024c496c369fd9e6fa /Source/Core | |
| parent | f75b1024aa98fb727d7d08408f65f97fea6731f3 (diff) | |
DolphinWX: Remove the Toggle IR hotkey.
This isn't necessary since Increase IR and Decrease IR are present.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HotkeyManager.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/Core/HotkeyManager.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 11 |
3 files changed, 2 insertions, 11 deletions
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 743d748de4..540e13708e 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -41,7 +41,6 @@ const std::string hotkey_labels[] = _trans("Increase IR"), _trans("Decrease IR"), - _trans("Toggle IR"), _trans("Toggle Aspect Ratio"), _trans("Toggle EFB Copies"), _trans("Toggle Fog"), diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index 4ff77d2e21..716baa5f26 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -40,7 +40,6 @@ enum Hotkey HK_INCREASE_IR, HK_DECREASE_IR, - HK_TOGGLE_IR, HK_TOGGLE_AR, HK_TOGGLE_EFBCOPIES, HK_TOGGLE_FOG, diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 73f8b2de3c..0ef07075ab 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1347,13 +1347,6 @@ void CFrame::ParseHotkeys() OnConnectWiimote(evt); } - if (IsHotkey(HK_TOGGLE_IR)) - { - OSDChoice = 1; - // Toggle native resolution - if (++g_Config.iEFBScale > 11) // 8X Internal Resolution - g_Config.iEFBScale = SCALE_AUTO; - } if (IsHotkey(HK_INCREASE_IR)) { OSDChoice = 1; @@ -1362,8 +1355,8 @@ void CFrame::ParseHotkeys() if (IsHotkey(HK_DECREASE_IR)) { OSDChoice = 1; - if (--g_Config.iEFBScale < SCALE_1X) - g_Config.iEFBScale = SCALE_1X; + if (--g_Config.iEFBScale < SCALE_AUTO) + g_Config.iEFBScale = SCALE_AUTO; } if (IsHotkey(HK_TOGGLE_AR)) { |