sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CommonHostInterface: De-duplicate stats overlay from FS UI

Browse Source
This commit is contained in:
Connor McLaughlin
2021-08-15 12:06:55 +10:00
parent 1ee3882afd
commit 4d9aa5ecdf
3 changed files with 25 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/frontend-common/common_host_interface.cpp
View File

@ -1189,13 +1189,13 @@ void CommonHostInterface::DrawImGuiWindows()
{
if (!IsCheevosChallengeModeActive())
DrawDebugWindows();
DrawFPSWindow();
DrawStatsOverlay();
}
DrawOSDMessages();
}
void CommonHostInterface::DrawFPSWindow()
void CommonHostInterface::DrawStatsOverlay()
{
if (!(g_settings.display_show_fps | g_settings.display_show_vps | g_settings.display_show_speed |
g_settings.display_show_resolution | System::IsPaused() | IsFastForwardEnabled() | IsTurboEnabled()))
@ -1203,13 +1203,28 @@ void CommonHostInterface::DrawFPSWindow()
return;
}
const float scale = ImGui::GetIO().DisplayFramebufferScale.x;
const float shadow_offset = 1.0f * scale;
float margin = 10.0f * scale;
float spacing = 5.0f * scale;
float position_y = margin;
float shadow_offset, margin, spacing, position_y;
ImFont* font;
if (m_fullscreen_ui_enabled)
{
margin = ImGuiFullscreen::LayoutScale(10.0f);
spacing = margin;
shadow_offset = ImGuiFullscreen::DPIScale(1.0f);
position_y = ImGuiFullscreen::g_menu_bar_size + margin;
font = ImGuiFullscreen::g_large_font;
}
else
{
const float scale = ImGui::GetIO().DisplayFramebufferScale.x;
shadow_offset = 1.0f * scale;
margin = 10.0f * scale;
spacing = 5.0f * scale;
position_y = margin;
font = ImGui::GetFont();
}
ImDrawList* dl = ImGui::GetBackgroundDrawList();
ImFont* font = ImGui::GetFont();
TinyString text;
ImVec2 text_size;
bool first = true;