Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-25 23:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: Fix FPS counter disappearing behind menu

Browse source
This commit is contained in:
Connor McLaughlin 2019-09-26 23:27:57 +10:00
parent e9bb3d79b8
commit b75674b149
2 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/pse-sdl/sdl_interface.cpp
View file

@ -392,7 +392,6 @@ void SDLInterface::RenderImGui()
m_system->RenderUI(); m_system->RenderUI();
RenderOSDMessages(); RenderOSDMessages();
RenderFPS();
ImGui::Render(); ImGui::Render();
} }
@ -450,6 +449,10 @@ void SDLInterface::RenderMainMenuBar()
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosX(ImGui::GetIO().DisplaySize.x - 80.0f);
ImGui::Text("FPS: %.2f", m_fps);
ImGui::EndMainMenuBar(); ImGui::EndMainMenuBar();
} }
@ -514,27 +517,6 @@ void SDLInterface::RenderOSDMessages()
} }
} }
void SDLInterface::RenderFPS()
{
// Position in the top-right corner of the screen.
ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x - 2.0f, 2.0f), ImGuiCond_Always, ImVec2(1.0f, 0.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
ImGui::SetNextWindowSize(ImVec2(80.0f, 20.0f));
if (ImGui::Begin("FPS", nullptr,
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoNav |
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing |
ImGuiWindowFlags_NoBackground))
{
ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 1.0f), "FPS: %.2f", m_fps);
}
ImGui::End();
ImGui::PopStyleVar(2);
}
void SDLInterface::DoLoadState(u32 index) void SDLInterface::DoLoadState(u32 index)
{ {
LoadState(GetSaveStateFilename(index)); LoadState(GetSaveStateFilename(index));

1
src/pse-sdl/sdl_interface.h
View file

@ -57,7 +57,6 @@ private:
void RenderDisplay(); void RenderDisplay();
void RenderMainMenuBar(); void RenderMainMenuBar();
void RenderOSDMessages(); void RenderOSDMessages();
void RenderFPS();
SDL_Window* m_window = nullptr; SDL_Window* m_window = nullptr;
SDL_GLContext m_gl_context = nullptr; SDL_GLContext m_gl_context = nullptr;