From eca922d3dfcea37c4f9136d567a352e6de14c273 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 31 Aug 2022 13:00:02 +0200
Subject: [PATCH] Fix console autocomplete window not padding elements
 correctly when size is between the clamped values

---
 r5dev/gameui/IConsole.cpp | 31 ++++++++++++++++++++++---------
 r5dev/gameui/IConsole.h   |  2 ++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index c572a209..324e316b 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -263,15 +263,7 @@ void CConsole::DrawSurface(void)
         m_bReclaimFocus = false;
     }
 
-    float nPad = 0.f;
-    if (m_vSuggest.size() > 1)
-    {
-        // Pad with 18 to keep all items in view.
-        nPad = ImGui::GetItemRectSize().y - 3;
-    }
-    m_ivSuggestWindowPos = ImGui::GetItemRectMin();
-    m_ivSuggestWindowPos.y += ImGui::GetItemRectSize().y;
-    m_ivSuggestWindowSize = ImVec2(600, nPad + std::clamp(static_cast<float>(m_vSuggest.size()) * fontSize.y, 37.0f, 127.5f));
+    BuildSuggestPanelRect();
 
     ImGui::SameLine();
     if (ImGui::Button("Submit"))
@@ -611,6 +603,27 @@ void CConsole::BuildSummary(string svConVar)
     }
 }
 
+//-----------------------------------------------------------------------------
+// Purpose: builds the suggestion panel rect
+//-----------------------------------------------------------------------------
+void CConsole::BuildSuggestPanelRect(void)
+{
+    float flSinglePadding = 0.f;
+    float flItemHeight = ImGui::GetTextLineHeightWithSpacing() + 1.0f;
+
+    if (m_vSuggest.size() > 1)
+    {
+        // Pad with 18 to keep all items in view.
+        flSinglePadding = flItemHeight;
+    }
+
+    m_ivSuggestWindowPos = ImGui::GetItemRectMin();
+    m_ivSuggestWindowPos.y += ImGui::GetItemRectSize().y;
+
+    float flWindowHeight = flSinglePadding + std::clamp(static_cast<float>(m_vSuggest.size()) * (flItemHeight), 37.0f, 127.5f);
+    m_ivSuggestWindowSize = ImVec2(600, flWindowHeight);
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: clamps the size of the log vector
 //-----------------------------------------------------------------------------
diff --git a/r5dev/gameui/IConsole.h b/r5dev/gameui/IConsole.h
index 9bc83479..7fbfaceb 100644
--- a/r5dev/gameui/IConsole.h
+++ b/r5dev/gameui/IConsole.h
@@ -31,7 +31,9 @@ private:
 
     void FindFromPartial(void);
     void ProcessCommand(const char* pszCommand);
+
     void BuildSummary(string svConVar = "");
+    void BuildSuggestPanelRect(void);
 
     void ClampLogSize(void);
     void ClampHistorySize(void);