mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2024-10-20 14:50:01 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

imgui: fix End call when window is collapsed (#850)

Browse source
This commit is contained in:
Vinicius Rangel 2024-09-09 01:00:19 -03:00 committed by GitHub
parent e3c2a91477
commit a0cf4ce7de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/libraries/system/msgdialog_ui.cpp
View file

@ -253,8 +253,7 @@ void MsgDialogUi::Draw() {
SetNextWindowCollapsed(false);
KeepNavHighlight();
// Hack to allow every dialog to have a unique window
if (Begin("Message Dialog##MessageDialog", nullptr,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoSavedSettings)) {
if (Begin("Message Dialog##MessageDialog", nullptr, ImGuiWindowFlags_NoSavedSettings)) {
switch (state->GetMode()) {
case MsgDialogMode::USER_MSG:
DrawUser();
@ -266,8 +265,8 @@ void MsgDialogUi::Draw() {
DrawSystemMessage();
break;
}
End();
}
End();
first_render = false;
}

6
src/imgui/layer/video_info.cpp
View file

@ -9,8 +9,10 @@ void ImGui::Layers::VideoInfo::Draw() {
m_show = IsKeyPressed(ImGuiKey_F10, false) ^ m_show;
if (m_show && Begin("Video Info")) {
Text("Frame time: %.3f ms (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
if (m_show) {
if (Begin("Video Info")) {
Text("Frame time: %.3f ms (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
}
End();
}
}