ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2593 from lioncash/hotkey 

DolphinWX: Remove the Toggle IR hotkey.
This commit is contained in:
Markus Wick 2015-06-19 12:29:05 +02:00
parent f75b1024aa 458378528b
commit 1376bd392e
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/HotkeyManager.cpp
View File

@ -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"),

1
Source/Core/Core/HotkeyManager.h
View File

@ -40,7 +40,6 @@ enum Hotkey
HK_INCREASE_IR,
HK_DECREASE_IR,
HK_TOGGLE_IR,
HK_TOGGLE_AR,
HK_TOGGLE_EFBCOPIES,
HK_TOGGLE_FOG,

11
Source/Core/DolphinWX/Frame.cpp
View File

@ -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))
{