some caching stuff and bug fixes
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
using Dalamud.Interface;
|
||||
using Dalamud.Interface.Utility;
|
||||
using Dalamud.Interface.Utility.Raii;
|
||||
using LightlessSync.API.Data.Enum;
|
||||
using LightlessSync.API.Data.Extensions;
|
||||
using LightlessSync.API.Dto.Group;
|
||||
using LightlessSync.API.Dto.User;
|
||||
@@ -13,6 +14,9 @@ using LightlessSync.Services.ServerConfiguration;
|
||||
using LightlessSync.UI.Handlers;
|
||||
using LightlessSync.Utils;
|
||||
using LightlessSync.WebAPI;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Text;
|
||||
|
||||
namespace LightlessSync.UI.Components;
|
||||
|
||||
@@ -32,6 +36,8 @@ public class DrawUserPair
|
||||
private readonly CharaDataManager _charaDataManager;
|
||||
private float _menuWidth = -1;
|
||||
private bool _wasHovered = false;
|
||||
private TooltipSnapshot _tooltipSnapshot = TooltipSnapshot.Empty;
|
||||
private string _cachedTooltip = string.Empty;
|
||||
|
||||
public DrawUserPair(string id, Pair entry, List<GroupFullInfoDto> syncedGroups,
|
||||
GroupFullInfoDto? currentGroup,
|
||||
@@ -190,15 +196,12 @@ public class DrawUserPair
|
||||
|
||||
private void DrawLeftSide()
|
||||
{
|
||||
string userPairText = string.Empty;
|
||||
|
||||
ImGui.AlignTextToFramePadding();
|
||||
|
||||
if (_pair.IsPaused)
|
||||
{
|
||||
using var _ = ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("LightlessYellow"));
|
||||
_uiSharedService.IconText(FontAwesomeIcon.PauseCircle);
|
||||
userPairText = _pair.UserData.AliasOrUID + " is paused";
|
||||
}
|
||||
else if (!_pair.IsOnline)
|
||||
{
|
||||
@@ -207,12 +210,10 @@ public class DrawUserPair
|
||||
? FontAwesomeIcon.ArrowsLeftRight
|
||||
: (_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.Bidirectional
|
||||
? FontAwesomeIcon.User : FontAwesomeIcon.Users));
|
||||
userPairText = _pair.UserData.AliasOrUID + " is offline";
|
||||
}
|
||||
else if (_pair.IsVisible)
|
||||
{
|
||||
_uiSharedService.IconText(FontAwesomeIcon.Eye, UIColors.Get("LightlessBlue"));
|
||||
userPairText = _pair.UserData.AliasOrUID + " is visible: " + _pair.PlayerName + Environment.NewLine + "Click to target this player";
|
||||
if (ImGui.IsItemClicked())
|
||||
{
|
||||
_mediator.Publish(new TargetPairMessage(_pair));
|
||||
@@ -223,46 +224,9 @@ public class DrawUserPair
|
||||
using var _ = ImRaii.PushColor(ImGuiCol.Text, UIColors.Get("PairBlue"));
|
||||
_uiSharedService.IconText(_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.Bidirectional
|
||||
? FontAwesomeIcon.User : FontAwesomeIcon.Users);
|
||||
userPairText = _pair.UserData.AliasOrUID + " is online";
|
||||
}
|
||||
|
||||
if (_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.OneSided)
|
||||
{
|
||||
userPairText += UiSharedService.TooltipSeparator + "User has not added you back";
|
||||
}
|
||||
else if (_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.Bidirectional)
|
||||
{
|
||||
userPairText += UiSharedService.TooltipSeparator + "You are directly Paired";
|
||||
}
|
||||
|
||||
if (_pair.LastAppliedDataBytes >= 0)
|
||||
{
|
||||
userPairText += UiSharedService.TooltipSeparator;
|
||||
userPairText += ((!_pair.IsPaired) ? "(Last) " : string.Empty) + "Mods Info" + Environment.NewLine;
|
||||
userPairText += "Files Size: " + UiSharedService.ByteToString(_pair.LastAppliedDataBytes, true);
|
||||
if (_pair.LastAppliedApproximateVRAMBytes >= 0)
|
||||
{
|
||||
userPairText += Environment.NewLine + "Approx. VRAM Usage: " + UiSharedService.ByteToString(_pair.LastAppliedApproximateVRAMBytes, true);
|
||||
}
|
||||
if (_pair.LastAppliedDataTris >= 0)
|
||||
{
|
||||
userPairText += Environment.NewLine + "Approx. Triangle Count (excl. Vanilla): "
|
||||
+ (_pair.LastAppliedDataTris > 1000 ? (_pair.LastAppliedDataTris / 1000d).ToString("0.0'k'") : _pair.LastAppliedDataTris);
|
||||
}
|
||||
}
|
||||
|
||||
if (_syncedGroups.Any())
|
||||
{
|
||||
userPairText += UiSharedService.TooltipSeparator + string.Join(Environment.NewLine,
|
||||
_syncedGroups.Select(g =>
|
||||
{
|
||||
var groupNote = _serverConfigurationManager.GetNoteForGid(g.GID);
|
||||
var groupString = string.IsNullOrEmpty(groupNote) ? g.GroupAliasOrGID : $"{groupNote} ({g.GroupAliasOrGID})";
|
||||
return "Paired through " + groupString;
|
||||
}));
|
||||
}
|
||||
|
||||
UiSharedService.AttachToolTip(userPairText);
|
||||
UiSharedService.AttachToolTip(GetUserTooltip());
|
||||
|
||||
if (_performanceConfigService.Current.ShowPerformanceIndicator
|
||||
&& !_performanceConfigService.Current.UIDsToIgnore
|
||||
@@ -327,6 +291,143 @@ public class DrawUserPair
|
||||
_displayHandler.DrawPairText(_id, _pair, leftSide, () => rightSide - leftSide);
|
||||
}
|
||||
|
||||
private string GetUserTooltip()
|
||||
{
|
||||
List<string>? groupDisplays = null;
|
||||
if (_syncedGroups.Count > 0)
|
||||
{
|
||||
groupDisplays = new List<string>(_syncedGroups.Count);
|
||||
foreach (var group in _syncedGroups)
|
||||
{
|
||||
var groupNote = _serverConfigurationManager.GetNoteForGid(group.GID);
|
||||
groupDisplays.Add(string.IsNullOrEmpty(groupNote) ? group.GroupAliasOrGID : $"{groupNote} ({group.GroupAliasOrGID})");
|
||||
}
|
||||
}
|
||||
|
||||
var snapshot = new TooltipSnapshot(
|
||||
_pair.IsPaused,
|
||||
_pair.IsOnline,
|
||||
_pair.IsVisible,
|
||||
_pair.IndividualPairStatus,
|
||||
_pair.UserData.AliasOrUID,
|
||||
_pair.PlayerName ?? string.Empty,
|
||||
_pair.LastAppliedDataBytes,
|
||||
_pair.LastAppliedApproximateVRAMBytes,
|
||||
_pair.LastAppliedDataTris,
|
||||
_pair.IsPaired,
|
||||
groupDisplays is null ? ImmutableArray<string>.Empty : ImmutableArray.CreateRange(groupDisplays));
|
||||
|
||||
if (!_tooltipSnapshot.Equals(snapshot))
|
||||
{
|
||||
_cachedTooltip = BuildTooltip(snapshot);
|
||||
_tooltipSnapshot = snapshot;
|
||||
}
|
||||
|
||||
return _cachedTooltip;
|
||||
}
|
||||
|
||||
private static string BuildTooltip(in TooltipSnapshot snapshot)
|
||||
{
|
||||
var builder = new StringBuilder(256);
|
||||
|
||||
if (snapshot.IsPaused)
|
||||
{
|
||||
builder.Append(snapshot.AliasOrUid);
|
||||
builder.Append(" is paused");
|
||||
}
|
||||
else if (!snapshot.IsOnline)
|
||||
{
|
||||
builder.Append(snapshot.AliasOrUid);
|
||||
builder.Append(" is offline");
|
||||
}
|
||||
else if (snapshot.IsVisible)
|
||||
{
|
||||
builder.Append(snapshot.AliasOrUid);
|
||||
builder.Append(" is visible: ");
|
||||
builder.Append(snapshot.PlayerName);
|
||||
builder.Append(Environment.NewLine);
|
||||
builder.Append("Click to target this player");
|
||||
}
|
||||
else
|
||||
{
|
||||
builder.Append(snapshot.AliasOrUid);
|
||||
builder.Append(" is online");
|
||||
}
|
||||
|
||||
if (snapshot.PairStatus == IndividualPairStatus.OneSided)
|
||||
{
|
||||
builder.Append(UiSharedService.TooltipSeparator);
|
||||
builder.Append("User has not added you back");
|
||||
}
|
||||
else if (snapshot.PairStatus == IndividualPairStatus.Bidirectional)
|
||||
{
|
||||
builder.Append(UiSharedService.TooltipSeparator);
|
||||
builder.Append("You are directly Paired");
|
||||
}
|
||||
|
||||
if (snapshot.LastAppliedDataBytes >= 0)
|
||||
{
|
||||
builder.Append(UiSharedService.TooltipSeparator);
|
||||
if (!snapshot.IsPaired)
|
||||
{
|
||||
builder.Append("(Last) ");
|
||||
}
|
||||
builder.Append("Mods Info");
|
||||
builder.Append(Environment.NewLine);
|
||||
builder.Append("Files Size: ");
|
||||
builder.Append(UiSharedService.ByteToString(snapshot.LastAppliedDataBytes, true));
|
||||
|
||||
if (snapshot.LastAppliedApproximateVRAMBytes >= 0)
|
||||
{
|
||||
builder.Append(Environment.NewLine);
|
||||
builder.Append("Approx. VRAM Usage: ");
|
||||
builder.Append(UiSharedService.ByteToString(snapshot.LastAppliedApproximateVRAMBytes, true));
|
||||
}
|
||||
|
||||
if (snapshot.LastAppliedDataTris >= 0)
|
||||
{
|
||||
builder.Append(Environment.NewLine);
|
||||
builder.Append("Approx. Triangle Count (excl. Vanilla): ");
|
||||
builder.Append(snapshot.LastAppliedDataTris > 1000
|
||||
? (snapshot.LastAppliedDataTris / 1000d).ToString("0.0'k'")
|
||||
: snapshot.LastAppliedDataTris);
|
||||
}
|
||||
}
|
||||
|
||||
if (!snapshot.GroupDisplays.IsEmpty)
|
||||
{
|
||||
builder.Append(UiSharedService.TooltipSeparator);
|
||||
for (int i = 0; i < snapshot.GroupDisplays.Length; i++)
|
||||
{
|
||||
if (i > 0)
|
||||
{
|
||||
builder.Append(Environment.NewLine);
|
||||
}
|
||||
builder.Append("Paired through ");
|
||||
builder.Append(snapshot.GroupDisplays[i]);
|
||||
}
|
||||
}
|
||||
|
||||
return builder.ToString();
|
||||
}
|
||||
|
||||
private readonly record struct TooltipSnapshot(
|
||||
bool IsPaused,
|
||||
bool IsOnline,
|
||||
bool IsVisible,
|
||||
IndividualPairStatus PairStatus,
|
||||
string AliasOrUid,
|
||||
string PlayerName,
|
||||
long LastAppliedDataBytes,
|
||||
long LastAppliedApproximateVRAMBytes,
|
||||
long LastAppliedDataTris,
|
||||
bool IsPaired,
|
||||
ImmutableArray<string> GroupDisplays)
|
||||
{
|
||||
public static TooltipSnapshot Empty { get; } =
|
||||
new(false, false, false, IndividualPairStatus.None, string.Empty, string.Empty, -1, -1, -1, false, ImmutableArray<string>.Empty);
|
||||
}
|
||||
|
||||
private void DrawPairedClientMenu()
|
||||
{
|
||||
DrawIndividualMenu();
|
||||
|
||||
Reference in New Issue
Block a user