From 339d2a9d5ee2b5f4e619121a74aa5596a2e9908c Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Wed, 9 Feb 2022 02:08:07 -0500
Subject: [PATCH] Tweak imgui font size & hinting

---
 Runtime/ImGuiConsole.cpp | 2 +-
 imgui/CMakeLists.txt     | 2 +-
 imgui/ImGuiEngine.cpp    | 8 +++-----
 imgui/ImGuiEngine.hpp    | 5 -----
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Runtime/ImGuiConsole.cpp b/Runtime/ImGuiConsole.cpp
index c3b75fc21..055f05895 100644
--- a/Runtime/ImGuiConsole.cpp
+++ b/Runtime/ImGuiConsole.cpp
@@ -627,7 +627,7 @@ void ImGuiConsole::ShowAboutWindow(bool canClose, std::string_view errorString)
       ImGui::PopStyleColor();
       ImGui::Dummy(padding);
     }
-    ImGuiTextCenter("2015-2021");
+    ImGuiTextCenter("2015-2022");
     ImGui::BeginGroup();
     ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(255, 255, 255, 200));
     ImGuiStringViewText("Development & Research");
diff --git a/imgui/CMakeLists.txt b/imgui/CMakeLists.txt
index eea75d5c2..f8e60aeef 100644
--- a/imgui/CMakeLists.txt
+++ b/imgui/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(imgui PRIVATE boo hecl-light RetroDataSpec aurora)
 find_package(Freetype)
 if (FREETYPE_FOUND)
   target_sources(imgui PRIVATE ../extern/imgui/misc/freetype/imgui_freetype.cpp)
-  target_compile_definitions(imgui PUBLIC IMGUI_ENABLE_FREETYPE)
+  target_compile_definitions(imgui PRIVATE IMGUI_ENABLE_FREETYPE)
   target_link_libraries(imgui PRIVATE Freetype::Freetype)
 endif ()
 
diff --git a/imgui/ImGuiEngine.cpp b/imgui/ImGuiEngine.cpp
index d11ca7027..8d77bc2ac 100644
--- a/imgui/ImGuiEngine.cpp
+++ b/imgui/ImGuiEngine.cpp
@@ -36,15 +36,13 @@ void ImGuiEngine_Initialize(float scale) {
   ImFontConfig fontConfig{};
   fontConfig.FontData = fontData;
   fontConfig.FontDataSize = int(NOTO_MONO_FONT_DECOMPRESSED_SZ);
-  fontConfig.SizePixels = std::floor(14.f * scale);
-#ifdef IMGUI_ENABLE_FREETYPE
-  fontConfig.FontBuilderFlags = ImGuiFreeTypeBuilderFlags_LightHinting;
-#endif
+  fontConfig.SizePixels = std::floor(15.f * scale);
   snprintf(static_cast<char*>(fontConfig.Name), sizeof(fontConfig.Name), "Noto Mono Regular, %dpx",
            static_cast<int>(fontConfig.SizePixels));
   ImGuiEngine::fontNormal = io.Fonts->AddFont(&fontConfig);
+
   fontConfig.FontDataOwnedByAtlas = false; // first one took ownership
-  fontConfig.SizePixels = std::floor(24.f * scale);
+  fontConfig.SizePixels = std::floor(26.f * scale);
 #ifdef IMGUI_ENABLE_FREETYPE
   fontConfig.FontBuilderFlags |= ImGuiFreeTypeBuilderFlags_Bold;
   snprintf(static_cast<char*>(fontConfig.Name), sizeof(fontConfig.Name), "Noto Mono Bold, %dpx",
diff --git a/imgui/ImGuiEngine.hpp b/imgui/ImGuiEngine.hpp
index eea82f242..12e4be85d 100644
--- a/imgui/ImGuiEngine.hpp
+++ b/imgui/ImGuiEngine.hpp
@@ -4,12 +4,7 @@
 #include "misc/cpp/imgui_stdlib.h"
 #include <memory>
 
-//#include <boo/IWindow.hpp>
-//#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
-
 namespace metaforce {
-constexpr inline int TranslateBooSpecialKey(boo::ESpecialKey key) { return 256 + static_cast<int>(key); }
-
 class ImGuiEngine {
 public:
   static ImFont* fontNormal;