CommonHostInterface: Fix crash in FS UI when scale changes

This commit is contained in:
Connor McLaughlin 2021-08-01 11:53:47 +10:00
parent a542fa85d6
commit b9d238d28b
1 changed files with 18 additions and 12 deletions

View File

@ -617,20 +617,26 @@ void CommonHostInterface::OnHostDisplayResized()
ImGui::GetStyle().WindowMinSize = ImVec2(1.0f, 1.0f); ImGui::GetStyle().WindowMinSize = ImVec2(1.0f, 1.0f);
ImGui::StyleColorsDarker(); ImGui::StyleColorsDarker();
ImGui::GetStyle().ScaleAllSizes(new_scale); ImGui::GetStyle().ScaleAllSizes(new_scale);
ImGuiFullscreen::ResetFonts();
if (!m_display->UpdateImGuiFontTexture())
Panic("Failed to recreate font texture after resize");
}
if (m_fullscreen_ui_enabled) if (m_fullscreen_ui_enabled)
{
if (ImGuiFullscreen::UpdateLayoutScale())
{ {
if (ImGuiFullscreen::UpdateFonts()) ImGuiFullscreen::UpdateLayoutScale();
{ ImGuiFullscreen::UpdateFonts();
if (!m_display->UpdateImGuiFontTexture()) }
Panic("Failed to update font texture"); else
} {
ImGuiFullscreen::ResetFonts();
}
if (!m_display->UpdateImGuiFontTexture())
Panic("Failed to recreate font texture after scale+resize");
}
else if (m_fullscreen_ui_enabled && ImGuiFullscreen::UpdateLayoutScale())
{
if (ImGuiFullscreen::UpdateFonts())
{
if (!m_display->UpdateImGuiFontTexture())
Panic("Failed to update font texture after resize");
} }
} }