piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon/RenderBase: Refactor OSD messages

Browse Source
This commit is contained in:
spycrab
2018-05-11 17:09:39 +02:00
parent 082573bd6b
commit 16e2ac9257
4 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/DolphinQt2/HotkeyScheduler.cpp
View File

@ -252,15 +252,20 @@ void HotkeyScheduler::Run()
emit ConnectWiiRemote(wiimote_id);
}
const auto show_msg = [](OSDMessage message) {
if (g_renderer)
g_renderer->ShowOSDMessage(message);
};
// Graphics
if (IsHotkey(HK_INCREASE_IR))
{
OSDChoice = 1;
show_msg(OSDMessage::IRChanged);
++g_Config.iEFBScale;
}
if (IsHotkey(HK_DECREASE_IR))
{
OSDChoice = 1;
show_msg(OSDMessage::IRChanged);
g_Config.iEFBScale = std::max(g_Config.iEFBScale - 1, EFB_SCALE_AUTO_INTEGRAL);
}
@ -269,29 +274,29 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_TOGGLE_AR))
{
OSDChoice = 2;
show_msg(OSDMessage::ARToggled);
g_Config.aspect_mode =
static_cast<AspectMode>((static_cast<int>(g_Config.aspect_mode) + 1) & 3);
}
if (IsHotkey(HK_TOGGLE_EFBCOPIES))
{
OSDChoice = 3;
show_msg(OSDMessage::EFBCopyToggled);
g_Config.bSkipEFBCopyToRam = !g_Config.bSkipEFBCopyToRam;
}
if (IsHotkey(HK_TOGGLE_XFBCOPIES))
{
OSDChoice = 6;
show_msg(OSDMessage::XFBChanged);
g_Config.bSkipXFBCopyToRam = !g_Config.bSkipXFBCopyToRam;
}
if (IsHotkey(HK_TOGGLE_IMMEDIATE_XFB))
{
OSDChoice = 6;
show_msg(OSDMessage::XFBChanged);
g_Config.bImmediateXFB = !g_Config.bImmediateXFB;
}
if (IsHotkey(HK_TOGGLE_FOG))
{
OSDChoice = 4;
show_msg(OSDMessage::FogToggled);
g_Config.bDisableFog = !g_Config.bDisableFog;
}
@ -305,7 +310,7 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_DECREASE_EMULATION_SPEED))
{
OSDChoice = 5;
show_msg(OSDMessage::SpeedChanged);
auto speed = SConfig::GetInstance().m_EmulationSpeed - 0.1;
speed = (speed <= 0 || (speed >= 0.95 && speed <= 1.05)) ? 1.0 : speed;
@ -314,7 +319,7 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_INCREASE_EMULATION_SPEED))
{
OSDChoice = 5;
show_msg(OSDMessage::SpeedChanged);
auto speed = SConfig::GetInstance().m_EmulationSpeed + 0.1;
speed = (speed >= 0.95 && speed <= 1.05) ? 1.0 : speed;