From 9803a38a57d287db366e293b46c258fb87bf1403 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Mon, 26 Aug 2024 14:41:58 +1000
Subject: [PATCH] ImGuiManager: Tweak OSD message size

---
 src/core/imgui_overlays.cpp | 12 ++++++------
 src/util/imgui_manager.cpp  | 13 +++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/core/imgui_overlays.cpp b/src/core/imgui_overlays.cpp
index c1f1ca1b2..1158357fe 100644
--- a/src/core/imgui_overlays.cpp
+++ b/src/core/imgui_overlays.cpp
@@ -116,10 +116,10 @@ void Host::DisplayLoadingScreen(const char* message, int progress_min /*= -1*/,
   }
   ImGui::End();
 
-  const float padding_and_rounding = 15.0f * scale;
+  const float padding_and_rounding = 18.0f * scale;
   ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, padding_and_rounding);
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(padding_and_rounding, padding_and_rounding));
-  ImGui::SetNextWindowSize(ImVec2(width, (has_progress ? 80.0f : 50.0f) * scale), ImGuiCond_Always);
+  ImGui::SetNextWindowSize(ImVec2(width, (has_progress ? 90.0f : 55.0f) * scale), ImGuiCond_Always);
   ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x * 0.5f, (io.DisplaySize.y * 0.5f) + (100.0f * scale)),
                           ImGuiCond_Always, ImVec2(0.5f, 0.0f));
   if (ImGui::Begin("LoadingScreen", nullptr,
@@ -976,10 +976,10 @@ void SaveStateSelectorUI::Draw()
 
   const auto& io = ImGui::GetIO();
   const float scale = ImGuiManager::GetGlobalScale();
-  const float width = (600.0f * scale);
-  const float height = (420.0f * scale);
+  const float width = (640.0f * scale);
+  const float height = (450.0f * scale);
 
-  const float padding_and_rounding = 15.0f * scale;
+  const float padding_and_rounding = 18.0f * scale;
   ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, padding_and_rounding);
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(padding_and_rounding, padding_and_rounding));
   ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.11f, 0.15f, 0.17f, 0.8f));
@@ -993,7 +993,7 @@ void SaveStateSelectorUI::Draw()
   {
     // Leave 2 lines for the legend
     const float legend_margin = ImGui::GetFontSize() * 2.0f + ImGui::GetStyle().ItemSpacing.y * 3.0f;
-    const float padding = 10.0f * scale;
+    const float padding = 12.0f * scale;
 
     ImGui::BeginChild("##item_list", ImVec2(0, -legend_margin), false,
                       ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoTitleBar |
diff --git a/src/util/imgui_manager.cpp b/src/util/imgui_manager.cpp
index 37d28141f..6890e220e 100644
--- a/src/util/imgui_manager.cpp
+++ b/src/util/imgui_manager.cpp
@@ -654,7 +654,8 @@ bool ImGuiManager::AddIconFonts(float size)
 
 bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts)
 {
-  const float standard_font_size = std::ceil(15.0f * s_global_scale);
+  const float standard_font_size = std::ceil(18.0f * s_global_scale);
+  const float fixed_font_size = std::ceil(15.0f * s_global_scale);
 
   ImGuiIO& io = ImGui::GetIO();
   io.Fonts->Clear();
@@ -663,7 +664,7 @@ bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts)
   if (!s_standard_font || !AddIconFonts(standard_font_size))
     return false;
 
-  s_fixed_font = AddFixedFont(standard_font_size);
+  s_fixed_font = AddFixedFont(fixed_font_size);
   if (!s_fixed_font)
     return false;
 
@@ -838,10 +839,10 @@ void ImGuiManager::DrawOSDMessages(Common::Timer::Value current_time)
 
   ImFont* const font = ImGui::GetFont();
   const float scale = s_global_scale;
-  const float spacing = std::ceil(5.0f * scale);
-  const float margin = std::ceil(10.0f * scale);
-  const float padding = std::ceil(8.0f * scale);
-  const float rounding = std::ceil(5.0f * scale);
+  const float spacing = std::ceil(6.0f * scale);
+  const float margin = std::ceil(12.0f * scale);
+  const float padding = std::ceil(10.0f * scale);
+  const float rounding = std::ceil(6.0f * scale);
   const float max_width = s_window_width - (margin + padding) * 2.0f;
   float position_x = margin;
   float position_y = margin;