anna
/
PeepingTom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: offset timestamp for scrollbar

This commit is contained in:
Anna 2021-04-08 12:57:48 -04:00
parent 20cc798f84
commit e6be33488c
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Peeping Tom/PluginUi.cs
View File

@ -437,32 +437,37 @@ namespace PeepingTom {
var height = ImGui.GetContentRegionAvail().Y; var height = ImGui.GetContentRegionAvail().Y;
height -= ImGui.GetStyle().ItemSpacing.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; var anyHovered = false;
if (ImGui.BeginListBox("##targeting", new Vector2(-1, height))) { if (ImGui.BeginListBox("##targeting", new Vector2(-1, height))) {
// add the two first players for testing // add the two first players for testing
//foreach (PlayerCharacter p in this.plugin.Interface.ClientState.Actors // foreach (var p in this.Plugin.Interface.ClientState.Actors
// .Where(actor => actor is PlayerCharacter) // .Where(actor => actor is PlayerCharacter)
// .Skip(1) // .Skip(1)
// .Select(actor => actor as PlayerCharacter) // .Select(actor => actor as PlayerCharacter)
// .Take(2)) { // .Take(2)) {
// this.AddEntry(new Targeter(p), p, ref anyHovered); // this.AddEntry(new Targeter(p), p, ref anyHovered, willScroll);
//} // }
foreach (var targeter in targeting) { foreach (var targeter in targeting) {
Actor? actor = null; Actor? actor = null;
actors?.TryGetValue(targeter.ActorId, out actor); actors?.TryGetValue(targeter.ActorId, out actor);
this.AddEntry(targeter, actor, ref anyHovered); this.AddEntry(targeter, actor, ref anyHovered, willScroll);
} }
if (this.Plugin.Config.KeepHistory) { if (this.Plugin.Config.KeepHistory) {
// get a list of the previous targeters that aren't currently targeting // get a list of the previous targeters that aren't currently targeting
var previous = (previousTargeters ?? new List<Targeter>()) var previous = previousWithoutCurrent.Take(this.Plugin.Config.NumHistory);
.Where(old => targeting.All(actor => actor.ActorId != old.ActorId))
.Take(this.Plugin.Config.NumHistory);
// add previous targeters to the list // add previous targeters to the list
foreach (var oldTargeter in previous) { foreach (var oldTargeter in previous) {
Actor? actor = null; Actor? actor = null;
actors?.TryGetValue(oldTargeter.ActorId, out actor); 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(); 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.BeginGroup();
ImGui.Selectable(targeter.Name, false, flags); ImGui.Selectable(targeter.Name, false, flags);
@ -506,7 +511,7 @@ namespace PeepingTom {
var time = DateTime.UtcNow - targeter.When >= TimeSpan.FromDays(1) var time = DateTime.UtcNow - targeter.When >= TimeSpan.FromDays(1)
? targeter.When.ToLocalTime().ToString("dd/MM") ? targeter.When.ToLocalTime().ToString("dd/MM")
: targeter.When.ToLocalTime().ToString("t"); : 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)) { if (flags.HasFlag(ImGuiSelectableFlags.Disabled)) {
ImGui.PushStyleColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]); ImGui.PushStyleColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]);