ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Don't draw fps/pause overlay over windows

This commit is contained in:
Connor McLaughlin 2021-03-03 03:01:31 +10:00
parent b45891f21a
commit 99ff0e64c5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontend-common/fullscreen_ui.cpp
View File

@ -2824,13 +2824,6 @@ HostDisplayTexture* GetCoverForCurrentGame()
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Overlays // Overlays
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
static ImDrawList* GetDrawListForOverlay()
{
// If we're in the landing page, draw the OSD over the windows (since it covers it)
return (s_current_main_window != MainWindowType::None) ? ImGui::GetForegroundDrawList() :
ImGui::GetBackgroundDrawList();
}
void DrawStatsOverlay() void DrawStatsOverlay()
{ {
if (!(g_settings.display_show_fps || g_settings.display_show_vps || g_settings.display_show_speed || if (!(g_settings.display_show_fps || g_settings.display_show_vps || g_settings.display_show_speed ||
@ -2843,7 +2836,7 @@ void DrawStatsOverlay()
const float margin = LayoutScale(10.0f); const float margin = LayoutScale(10.0f);
const float shadow_offset = DPIScale(1.0f); const float shadow_offset = DPIScale(1.0f);
float position_y = margin; float position_y = margin;
ImDrawList* dl = GetDrawListForOverlay(); ImDrawList* dl = ImGui::GetBackgroundDrawList();
TinyString text; TinyString text;
ImVec2 text_size; ImVec2 text_size;
bool first = true; bool first = true;
@ -2942,7 +2935,10 @@ void DrawOSDMessages()
const ImVec2 text_size(ImGui::CalcTextSize(message.c_str(), nullptr, false, max_width)); const ImVec2 text_size(ImGui::CalcTextSize(message.c_str(), nullptr, false, max_width));
const ImVec2 size(text_size + LayoutScale(20.0f, 20.0f)); const ImVec2 size(text_size + LayoutScale(20.0f, 20.0f));
const ImVec4 text_rect(pos.x + padding, pos.y + padding, pos.x + size.x - padding, pos.y + size.y - padding); const ImVec4 text_rect(pos.x + padding, pos.y + padding, pos.x + size.x - padding, pos.y + size.y - padding);
ImDrawList* dl = GetDrawListForOverlay();
// If we're in the landing page, draw the OSD over the windows (since it covers it)
ImDrawList* dl = (s_current_main_window != MainWindowType::None) ? ImGui::GetForegroundDrawList() :
ImGui::GetBackgroundDrawList();
dl->AddRectFilled(pos, pos + size, IM_COL32(0x21, 0x21, 0x21, alpha), LayoutScale(10.0f)); dl->AddRectFilled(pos, pos + size, IM_COL32(0x21, 0x21, 0x21, alpha), LayoutScale(10.0f));
dl->AddRect(pos, pos + size, IM_COL32(0x48, 0x48, 0x48, alpha), LayoutScale(10.0f)); dl->AddRect(pos, pos + size, IM_COL32(0x48, 0x48, 0x48, alpha), LayoutScale(10.0f));
dl->AddText(g_large_font, g_large_font->FontSize, ImVec2(text_rect.x, text_rect.y), dl->AddText(g_large_font, g_large_font->FontSize, ImVec2(text_rect.x, text_rect.y),