diff options
| author | Pokechu22 <Pokechu022@gmail.com> | 2021-10-26 14:34:39 -0700 |
|---|---|---|
| committer | Pokechu22 <Pokechu022@gmail.com> | 2021-10-26 15:07:57 -0700 |
| commit | db54e4f2b0c4a1b1416b9f96012a02adde31ea55 (patch) | |
| tree | f2080c389f70cfd99c8f5e49b83d3e6188ed073a /Source/Core | |
| parent | 05b4aecf18cac8b49ee7ef7314d2fac97ec82363 (diff) | |
Externals: Update imgui to 1.85
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoCommon/NetPlayChatUI.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/ShaderCache.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/NetPlayChatUI.cpp b/Source/Core/VideoCommon/NetPlayChatUI.cpp index bdeac150ea..c9db29af64 100644 --- a/Source/Core/VideoCommon/NetPlayChatUI.cpp +++ b/Source/Core/VideoCommon/NetPlayChatUI.cpp @@ -45,7 +45,7 @@ void NetPlayChatUI::Display() if (m_scroll_to_bottom) { - ImGui::SetScrollHere(1.0f); + ImGui::SetScrollHereY(1.0f); m_scroll_to_bottom = false; } diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 45e42e7931..043add2996 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -978,6 +978,7 @@ bool Renderer::InitializeImGui() ImGui::GetIO().DisplayFramebufferScale.y = m_backbuffer_scale; ImGui::GetIO().FontGlobalScale = m_backbuffer_scale; ImGui::GetStyle().ScaleAllSizes(m_backbuffer_scale); + ImGui::GetStyle().WindowRounding = 7.0f; PortableVertexDeclaration vdecl = {}; vdecl.position = {VAR_FLOAT, 2, offsetof(ImDrawVert, pos), true, false}; diff --git a/Source/Core/VideoCommon/ShaderCache.cpp b/Source/Core/VideoCommon/ShaderCache.cpp index 655a5b6bb1..8b1196cabc 100644 --- a/Source/Core/VideoCommon/ShaderCache.cpp +++ b/Source/Core/VideoCommon/ShaderCache.cpp @@ -160,10 +160,12 @@ void ShaderCache::WaitForAsyncCompiler() m_async_shader_compiler->WaitUntilCompletion([](size_t completed, size_t total) { g_renderer->BeginUIFrame(); + const float center_x = ImGui::GetIO().DisplaySize.x * 0.5f; + const float center_y = ImGui::GetIO().DisplaySize.y * 0.5f; const float scale = ImGui::GetIO().DisplayFramebufferScale.x; ImGui::SetNextWindowSize(ImVec2(400.0f * scale, 50.0f * scale), ImGuiCond_Always); - ImGui::SetNextWindowPosCenter(ImGuiCond_Always); + ImGui::SetNextWindowPos(ImVec2(center_x, center_y), ImGuiCond_Always, ImVec2(0.5f, 0.5f)); if (ImGui::Begin(Common::GetStringT("Compiling Shaders").c_str(), nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | |
