imgui: fix End call when window is collapsed ()

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
src
core/libraries/system
imgui/layer

View file

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

View file

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