From 2eda8235b75a0dbce01e62845d830dd228cbd583 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Fri, 24 Jun 2022 12:45:47 +0200
Subject: [PATCH] Slight theming tweaks

Minor improvements to small detail:
No child border on console on default theme (this is invisible).
Tweaked first use size and min size where by default the text would always perfectly align between ScrollY min and max.
---
 r5dev/gameui/IBrowser.cpp                    | 5 +++++
 r5dev/gameui/IConsole.cpp                    | 7 +++----
 r5dev/thirdparty/imgui/src/imgui_utility.cpp | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp
index 6031e54c..40895b46 100644
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@@ -92,6 +92,11 @@ void CBrowser::Draw(void)
     ImGui::PushStyleVar(ImGuiStyleVar_Alpha, m_flFadeAlpha);                   nVars++;
     ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(750, 510));        nVars++;
 
+    if (!m_bModernTheme)
+    {
+        ImGui::PushStyleVar(ImGuiStyleVar_ChildBorderSize, 1.0f);              nVars++;
+    }
+
     if (!ImGui::Begin(m_pszBrowserTitle, &m_bActivate))
     {
         ImGui::End();
diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index 32ee1c92..8570b2e1 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -95,11 +95,10 @@ void CConsole::Draw(void)
         }
         else
         {
-            ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{ 4.f, 6.f });  nVars++;
-            ImGui::PushStyleVar(ImGuiStyleVar_ChildBorderSize, 1.0f);              nVars++;
+            ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{ 6.f, 6.f });  nVars++;
             ImGui::PushStyleVar(ImGuiStyleVar_Alpha, m_flFadeAlpha);               nVars++;
         }
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(618, 518));        nVars++;
+        ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(618, 524));        nVars++;
 
         BasePanel();
         ImGui::PopStyleVar(nVars);
@@ -829,7 +828,7 @@ void CConsole::SetStyleVar(void)
         m_bModernTheme = true;
     }
 
-    ImGui::SetNextWindowSize(ImVec2(1200, 518), ImGuiCond_FirstUseEver);
+    ImGui::SetNextWindowSize(ImVec2(1200, 524), ImGuiCond_FirstUseEver);
     ImGui::SetWindowPos(ImVec2(-1000, 50), ImGuiCond_FirstUseEver);
 }
 
diff --git a/r5dev/thirdparty/imgui/src/imgui_utility.cpp b/r5dev/thirdparty/imgui/src/imgui_utility.cpp
index 362e611c..d0c742b9 100644
--- a/r5dev/thirdparty/imgui/src/imgui_utility.cpp
+++ b/r5dev/thirdparty/imgui/src/imgui_utility.cpp
@@ -256,7 +256,7 @@ int ImGuiConfig::InitStyle() const
 
         style.WindowBorderSize  = 1.0f;
         style.FrameBorderSize   = 1.0f;
-        style.ChildBorderSize   = 1.0f;
+        style.ChildBorderSize   = 0.0f;
         style.PopupBorderSize   = 1.0f;
         style.TabBorderSize     = 1.0f;