From 7691fa1b5f05d564b890e8bb7ad93dd368100c4b Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 17 Jun 2023 16:30:10 +0200 Subject: [PATCH] Light console optimizations --- r5dev/gameui/IConsole.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp index 4d3ea04f..ac8d2253 100644 --- a/r5dev/gameui/IConsole.cpp +++ b/r5dev/gameui/IConsole.cpp @@ -162,7 +162,7 @@ void CConsole::RunFrame(void) { if (m_Style == ImGuiStyle_t::MODERN) { - static const ImGuiStyle& style = ImGui::GetStyle(); + const ImGuiStyle& style = ImGui::GetStyle(); m_ivSuggestWindowPos.y = m_ivSuggestWindowPos.y + style.WindowPadding.y + 1.5f; } @@ -235,9 +235,11 @@ void CConsole::DrawSurface(void) return; } + const ImGuiStyle& style = ImGui::GetStyle(); + // Reserve enough left-over height and width for 1 separator + 1 input text - const float flFooterHeightReserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); - const float flFooterWidthReserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetWindowWidth(); + const float flFooterHeightReserve = style.ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); + const float flFooterWidthReserve = style.ItemSpacing.y + ImGui::GetWindowWidth(); ImVec2 fontSize = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, "#", nullptr, nullptr); ///////////////////////////////////////////////////////////////////////