From a9e65802588eb47bb5de207c58ea23f1dd818977 Mon Sep 17 00:00:00 2001
From: Ryan Mroczenski <rmroc451@gmail.com>
Date: Mon, 17 Jun 2024 20:54:05 -0500
Subject: [PATCH] work in progress attempts to resolve text overlapping on car
 tag titles.

---
 ...ch.cs => TagController_UpdateTag_Patch.cs} | 39 +++++++------------
 .../RMROC451.TweaksAndThings.csproj           |  8 +---
 2 files changed, 15 insertions(+), 32 deletions(-)
 rename TweaksAndThings/Patches/{TagConroller_UpdateTag_Patch.cs => TagController_UpdateTag_Patch.cs} (69%)

diff --git a/TweaksAndThings/Patches/TagConroller_UpdateTag_Patch.cs b/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs
similarity index 69%
rename from TweaksAndThings/Patches/TagConroller_UpdateTag_Patch.cs
rename to TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs
index 38d85e6..b7a44be 100644
--- a/TweaksAndThings/Patches/TagConroller_UpdateTag_Patch.cs
+++ b/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs
@@ -1,48 +1,35 @@
 using HarmonyLib;
-using JetBrains.Annotations;
 using Model;
-using Model.AI;
 using Model.OpsNew;
 using Railloader;
-using Serilog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
-using Track;
-using TweaksAndThings;
 using UI;
-using UI.Builder;
-using UI.CarInspector;
 using UI.Tags;
 using UnityEngine;
-using static Model.Car;
-using tat = TweaksAndThings.TweaksAndThings;
 
 namespace TweaksAndThings.Patches;
 
 [HarmonyPatch(typeof(TagController))]
 [HarmonyPatch(nameof(TagController.UpdateTag), typeof(Car), typeof(TagCallout), typeof(OpsController))]
 [HarmonyPatchCategory("RMROC451TweaksAndThings")]
-public class TagConroller_UpdateTag_Patch
+public class TagController_UpdateTag_Patch
 {
     private static void Postfix(Car car, TagCallout tagCallout)
     {
         TagController tagController = UnityEngine.Object.FindObjectOfType<TagController>();
         TweaksAndThings tweaksAndThings = SingletonPluginBase<TweaksAndThings>.Shared;
-        tagCallout.callout.Title = $"<align=left>{car.DisplayName}<line-height=0>";
+        bool concatOnly = car.DisplayName.Length > 6;
+        string delimiter = concatOnly ? " " : "\n<align=\"right\">";
 
         if (!tweaksAndThings.IsEnabled || !tweaksAndThings.settings.HandBrakeAndAirTagModifiers)
         {
             return;
         }
-
+        tagCallout.callout.Title = concatOnly ? $"<align=left>{car.DisplayName} <space=.5em> " : $"<align=left>{car.DisplayName}<line-height=0>";
         tagCallout.gameObject.SetActive(
             tagCallout.gameObject.activeSelf && 
             (!GameInput.IsShiftDown || (GameInput.IsShiftDown && car.CarOrEndGearIssue()))
         );
+
         if (tagCallout.gameObject.activeSelf && GameInput.IsShiftDown && car.CarOrEndGearIssue()) {
 
             tagController.ApplyImageColor(tagCallout, Color.black);
@@ -50,17 +37,17 @@ public class TagConroller_UpdateTag_Patch
 
         if (car.CarAndEndGearIssue())
         {
-            tagCallout.callout.Title =
-                    $"{tagCallout.callout.Title}\n<align=\"right\">{TextSprites.CycleWaybills}{TextSprites.HandbrakeWheel}";
+            tagCallout.callout.Title = $"{tagCallout.callout.Title}{delimiter}{TextSprites.CycleWaybills}{TextSprites.HandbrakeWheel}";
         }
         else if (car.EndAirSystemIssue())
-                tagCallout.callout.Title =
-                    $"{tagCallout.callout.Title}\n<align=\"right\">{TextSprites.CycleWaybills}";
-        else if (car.HandbrakeApplied())
-                tagCallout.callout.Title =
-                    $"{tagCallout.callout.Title}\n<align=\"right\">{TextSprites.HandbrakeWheel}";
-            
+        {
+            tagCallout.callout.Title = $"{tagCallout.callout.Title}{delimiter}{TextSprites.CycleWaybills}";
 
+        }
+        else if (car.HandbrakeApplied())
+        {
+            tagCallout.callout.Title = $"{tagCallout.callout.Title}{delimiter}{TextSprites.HandbrakeWheel}";
+        }
         return;
     }
 }
diff --git a/TweaksAndThings/RMROC451.TweaksAndThings.csproj b/TweaksAndThings/RMROC451.TweaksAndThings.csproj
index 47d737c..af81fa5 100644
--- a/TweaksAndThings/RMROC451.TweaksAndThings.csproj
+++ b/TweaksAndThings/RMROC451.TweaksAndThings.csproj
@@ -13,6 +13,8 @@
     <GameAssembly Include="Definition" />
 
     <GameAssembly Include="UnityEngine.CoreModule" />
+    <GameAssembly Include="UnityEngine.UI" />
+    <GameAssembly Include="Unity.TextMeshPro" />
 
     <GameAssembly Include="System.Net.Http" />
   </ItemGroup>
@@ -27,10 +29,4 @@
   <ItemGroup>
     <Publicize Include="Assembly-CSharp" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Reference Include="ForYourConvenience">
-      <HintPath>D:\SteamLibrary\steamapps\common\Railroader\Mods\ForYourConvenience\ForYourConvenience.dll</HintPath>
-    </Reference>
-  </ItemGroup>
 </Project>