From e6be33488cfb0990a91a5ed98bb0f592e219e996 Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Thu, 8 Apr 2021 12:57:48 -0400
Subject: [PATCH] fix: offset timestamp for scrollbar

---
 Peeping Tom/PluginUi.cs | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Peeping Tom/PluginUi.cs b/Peeping Tom/PluginUi.cs
index c982b5a..6038e53 100644
--- a/Peeping Tom/PluginUi.cs	
+++ b/Peeping Tom/PluginUi.cs	
@@ -437,32 +437,37 @@ namespace PeepingTom {
                 var height = ImGui.GetContentRegionAvail().Y;
                 height -= ImGui.GetStyle().ItemSpacing.Y;
 
+                var previousWithoutCurrent = (previousTargeters ?? new List<Targeter>())
+                    .Where(old => targeting.All(actor => actor.ActorId != old.ActorId))
+                    .ToList();
+                var numItems = targeting.Count + Math.Min(previousWithoutCurrent.Count, this.Plugin.Config.NumHistory);
+                var willScroll = (ImGui.CalcTextSize("A").Y + ImGui.GetStyle().ItemInnerSpacing.Y) * numItems > height;
+
                 var anyHovered = false;
                 if (ImGui.BeginListBox("##targeting", new Vector2(-1, height))) {
                     // add the two first players for testing
-                    //foreach (PlayerCharacter p in this.plugin.Interface.ClientState.Actors
-                    //    .Where(actor => actor is PlayerCharacter)
-                    //    .Skip(1)
-                    //    .Select(actor => actor as PlayerCharacter)
-                    //    .Take(2)) {
-                    //    this.AddEntry(new Targeter(p), p, ref anyHovered);
-                    //}
+                    // foreach (var p in this.Plugin.Interface.ClientState.Actors
+                    //     .Where(actor => actor is PlayerCharacter)
+                    //     .Skip(1)
+                    //     .Select(actor => actor as PlayerCharacter)
+                    //     .Take(2)) {
+                    //     this.AddEntry(new Targeter(p), p, ref anyHovered, willScroll);
+                    // }
+
                     foreach (var targeter in targeting) {
                         Actor? actor = null;
                         actors?.TryGetValue(targeter.ActorId, out actor);
-                        this.AddEntry(targeter, actor, ref anyHovered);
+                        this.AddEntry(targeter, actor, ref anyHovered, willScroll);
                     }
 
                     if (this.Plugin.Config.KeepHistory) {
                         // get a list of the previous targeters that aren't currently targeting
-                        var previous = (previousTargeters ?? new List<Targeter>())
-                            .Where(old => targeting.All(actor => actor.ActorId != old.ActorId))
-                            .Take(this.Plugin.Config.NumHistory);
+                        var previous = previousWithoutCurrent.Take(this.Plugin.Config.NumHistory);
                         // add previous targeters to the list
                         foreach (var oldTargeter in previous) {
                             Actor? actor = null;
                             actors?.TryGetValue(oldTargeter.ActorId, out actor);
-                            this.AddEntry(oldTargeter, actor, ref anyHovered, ImGuiSelectableFlags.Disabled);
+                            this.AddEntry(oldTargeter, actor, ref anyHovered, willScroll, ImGuiSelectableFlags.Disabled);
                         }
                     }
 
@@ -498,7 +503,7 @@ namespace PeepingTom {
             ImGui.EndTooltip();
         }
 
-        private void AddEntry(Targeter targeter, Actor? actor, ref bool anyHovered, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None) {
+        private void AddEntry(Targeter targeter, Actor? actor, ref bool anyHovered, bool willScroll, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None) {
             ImGui.BeginGroup();
 
             ImGui.Selectable(targeter.Name, false, flags);
@@ -506,7 +511,7 @@ namespace PeepingTom {
             var time = DateTime.UtcNow - targeter.When >= TimeSpan.FromDays(1)
                 ? targeter.When.ToLocalTime().ToString("dd/MM")
                 : targeter.When.ToLocalTime().ToString("t");
-            ImGui.SameLine(ImGui.GetWindowSize().X - ImGui.GetStyle().ItemSpacing.X - ImGui.CalcTextSize(time).X);
+            ImGui.SameLine(ImGui.GetWindowSize().X - ImGui.GetStyle().ItemSpacing.X - ImGui.CalcTextSize(time).X - (willScroll ? ImGui.GetStyle().ScrollbarSize : 0));
 
             if (flags.HasFlag(ImGuiSelectableFlags.Disabled)) {
                 ImGui.PushStyleColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]);