mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-31 22:55:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1315 from RisingFog/movie-menu-input-display

Browse source 
Moved Input Display to Movie Menu
This commit is contained in:
skidau 2014-10-20 14:34:02 +11:00
commit 81efd0e87f
11 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D/Render.cpp
View file

@ -861,7 +861,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
D3D::font.DrawTextScaled(0, 18, 20, 0.0f, 0xFF00FFFF, lag);
}
if (g_ActiveConfig.bShowInputDisplay)
if (SConfig::GetInstance().m_ShowInputDisplay)
{
D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, Movie::GetInputDisplay());
}

2
Source/Core/VideoBackends/OGL/Render.cpp
View file

@ -730,7 +730,7 @@ void Renderer::DrawDebugInfo()
if (SConfig::GetInstance().m_ShowLag)
debug_info += StringFromFormat("Lag: %" PRIu64 "\n", Movie::g_currentLagCount);
if (g_ActiveConfig.bShowInputDisplay)
if (SConfig::GetInstance().m_ShowInputDisplay)
debug_info += Movie::GetInputDisplay();
if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL && g_ActiveConfig.bShowEFBCopyRegions)