From 5b622683f4a24cfbdf2b43617dac5de64e9aff5d Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 16 Mar 2025 13:51:52 -0700
Subject: [PATCH] Clean up Push/Pop font calls in check and item trackers by
 adding them instead to Begin/EndFloatWindows functions. (#5122)

Add missing PopFont call to entrance tracker.
---
 .../Enhancements/randomizer/randomizer_check_tracker.cpp  | 8 ++------
 .../randomizer/randomizer_entrance_tracker.cpp            | 1 +
 .../Enhancements/randomizer/randomizer_item_tracker.cpp   | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index cc139fbfd..a60865de4 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -876,8 +876,6 @@ void CheckTrackerWindow::DrawElement() {
 
     hideShopUnshuffledChecks = CVarGetInteger(CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"), 1);
     alwaysShowGS = CVarGetInteger(CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), 0);
-
-    ImGui::PushFont(OTRGlobals::Instance->fontStandardLarger);
     if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) {
         if (CVarGetInteger(CVAR_TRACKER_CHECK("ShowOnlyPaused"), 0) && (gPlayState == nullptr || gPlayState->pauseCtx.state == 0)) {
             return;
@@ -901,7 +899,6 @@ void CheckTrackerWindow::DrawElement() {
 
     if (!GameInteractor::IsSaveLoaded() || !initialized) {
         ImGui::Text("Waiting for file load..."); //TODO Language
-        ImGui::PopFont();
         EndFloatWindows();
         return;
     }
@@ -920,7 +917,6 @@ void CheckTrackerWindow::DrawElement() {
     ImVec2 size = ImGui::GetContentRegionMax();
     size.y -= headerHeight;
     if (!ImGui::BeginTable("Check Tracker", 1, 0, size)) {
-        ImGui::PopFont();
         EndFloatWindows();
         return;
     }
@@ -965,7 +961,6 @@ void CheckTrackerWindow::DrawElement() {
     size = ImGui::GetContentRegionAvail();
     if (!ImGui::BeginTable("CheckTracker##Checks", 1, ImGuiTableFlags_ScrollY, size)) {
         ImGui::EndTable();
-        ImGui::PopFont();
         EndFloatWindows();
         return;
     }
@@ -1081,7 +1076,6 @@ void CheckTrackerWindow::DrawElement() {
 
     ImGui::EndTable(); //Checks Lead-out
     ImGui::EndTable(); //Quick Options Lead-out
-    ImGui::PopFont();
     EndFloatWindows();
     if (doingCollapseOrExpand) {
         optCollapseAll = false;
@@ -1147,12 +1141,14 @@ void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flag
                                                     Color_Background.b / 255.0f, Color_Background.a / 255.0f));
     ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
+    ImGui::PushFont(OTRGlobals::Instance->fontStandardLarger);
     ImGui::Begin(UniqueName.c_str(), &open, windowFlags);
 }
 void EndFloatWindows() {
     ImGui::PopStyleVar();
     ImGui::PopStyleColor();
     ImGui::PopStyleColor();
+    ImGui::PopFont();
     ImGui::End();
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
index 7a151a983..49755ff06 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@@ -740,6 +740,7 @@ void EntranceTrackerWindow::DrawElement() {
 
     if (!ImGui::Begin("Entrance Tracker", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
         ImGui::End();
+        ImGui::PopFont();
         return;
     }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 828fcda2d..9bb562b31 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -952,12 +952,14 @@ void BeginFloatingWindows(std::string UniqueName, ImGuiWindowFlags flags = 0) {
     ImGui::PushStyleColor(ImGuiCol_WindowBg, VecFromRGBA8(CVarGetColor(CVAR_TRACKER_ITEM("BgColor.Value"), {0, 0, 0, 0})));
     ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
+    ImGui::PushFont(OTRGlobals::Instance->fontStandardLarger);
     ImGui::Begin(UniqueName.c_str(), nullptr, windowFlags);
 }
 void EndFloatingWindows() {
     ImGui::PopStyleVar();
     ImGui::PopStyleColor();
     ImGui::PopStyleColor();
+    ImGui::PopFont();
     ImGui::End();
 }
 
@@ -1222,7 +1224,6 @@ void ItemTrackerWindow::Draw() {
 }
 
 void ItemTrackerWindow::DrawElement() {
-    ImGui::PushFont(OTRGlobals::Instance->fontStandardLarger);
     UpdateVectors();
 
     int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
@@ -1353,7 +1354,6 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
     }
-    ImGui::PopFont();
 }
 
 static std::unordered_map<int32_t, const char*> itemTrackerCapacityTrackOptions = {