3.0.5

Author: Eauldane

Snowcloak/Services/Mediator/Messages/Messages.Ui.cs

@@ -9,23 +9,23 @@ namespace Snowcloak.Services.Mediator;
 
 #pragma warning disable MA0048 // File name must match type name
 #pragma warning disable S2094
-public record OpenSettingsUiMessage : MessageBase;
+public record OpenSettingsUiMessage : SameThreadMessage;
 public record NotificationMessage
     (string Title, string Message, NotificationType Type, TimeSpan? TimeShownOnScreen = null) : MessageBase;
-public record UiToggleMessage(Type UiType) : MessageBase;
-public record ProfilePopoutToggle(Pair? Pair) : MessageBase;
+public record UiToggleMessage(Type UiType) : SameThreadMessage;
+public record ProfilePopoutToggle(Pair? Pair) : SameThreadMessage;
 public record CompactUiChange(Vector2 Size, Vector2 Position) : MessageBase;
 public record ProfileOpenStandaloneMessage(UserData UserData, Pair? Pair = null, ProfileVisibility? RequestedVisibility = null,
     string? Ident = null, string? FallbackName = null) : MessageBase;
 public record RemoveWindowMessage(WindowMediatorSubscriberBase Window) : MessageBase;
-public record OpenReportPopupMessage(Pair PairToReport, string Ident, ProfileVisibility Visibility, long Revision) : MessageBase;
-public record OpenBanUserPopupMessage(Pair PairToBan, GroupFullInfoDto GroupFullInfoDto) : MessageBase;
+public record OpenReportPopupMessage(Pair PairToReport, string Ident, ProfileVisibility Visibility, long Revision) : SameThreadMessage;
+public record OpenBanUserPopupMessage(Pair PairToBan, GroupFullInfoDto GroupFullInfoDto) : SameThreadMessage;
 public record OpenSyncshellAdminPanel(GroupFullInfoDto GroupInfo) : MessageBase;
 public record OpenSyncshellEventsWindow(GroupFullInfoDto GroupInfo) : MessageBase;
 public record OpenPermissionWindow(Pair Pair) : MessageBase;
 public record OpenPairAnalysisWindow(Pair Pair) : MessageBase;
 public record OpenSyncTroubleshootingWindow(Pair Pair) : MessageBase;
-public record OpenBbCodeLinkPopupMessage(string Url) : MessageBase;
-public record OpenFrostbrandUiMessage : MessageBase;
+public record OpenBbCodeLinkPopupMessage(string Url) : SameThreadMessage;
+public record OpenFrostbrandUiMessage : SameThreadMessage;
 #pragma warning restore S2094
 #pragma warning restore MA0048 // File name must match type name

Snowcloak/Services/Mediator/Messages/Messages.Venue.cs

@@ -5,10 +5,10 @@ namespace Snowcloak.Services.Mediator;
 
 #pragma warning disable MA0048 // File name must match type name
 #pragma warning disable S2094
-public record OpenVenueSyncshellPopupMessage(VenueSyncshellPrompt Prompt) : MessageBase;
+public record OpenVenueSyncshellPopupMessage(VenueSyncshellPrompt Prompt) : SameThreadMessage;
 public record VenueSyncshellJoinAcceptedMessage(VenueSyncshellDto Venue, VenueLocationDto Location) : MessageBase;
-public record OpenVenueRegistrationWindowMessage(VenueRegistrationContext Context) : MessageBase;
-public record OpenVenueRegistryWindowMessage : MessageBase;
-public record OpenVenueAdsWindowMessage(bool OpenCreate) : MessageBase;
+public record OpenVenueRegistrationWindowMessage(VenueRegistrationContext Context) : SameThreadMessage;
+public record OpenVenueRegistryWindowMessage : SameThreadMessage;
+public record OpenVenueAdsWindowMessage(bool OpenCreate) : SameThreadMessage;
 #pragma warning restore S2094
 #pragma warning restore MA0048 // File name must match type name

Snowcloak/Snowcloak.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Dalamud.NET.Sdk/15.0.0">
   <PropertyGroup>
      <AssemblyName>Snowcloak</AssemblyName>
-    <Version>3.0.4.0</Version>
+    <Version>3.0.5.0</Version>
     <PackageProjectUrl>https://github.com/Eauldane/SnowcloakClient/</PackageProjectUrl>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <Configurations>Release;Debug</Configurations>

Snowcloak/UI/Components/DrawGroupPair.cs

@@ -28,6 +28,8 @@ public class DrawGroupPair : DrawPairBase
     private readonly CharaDataManager _charaDataManager;
     private readonly SnowcloakConfigService _configService;
     public long VRAMUsage { get; set; }
+    public GroupFullInfoDto Group => _group;
+    public GroupPairFullInfoDto GroupPairInfo => _fullInfoDto;
 
     public DrawGroupPair(string id, Pair entry, ApiController apiController,
         SnowMediator snowMediator, GroupFullInfoDto group, GroupPairFullInfoDto fullInfoDto,

Snowcloak/UI/Components/GroupPanel.cs

@@ -55,6 +55,7 @@ internal sealed class GroupPanel
     private string? _publicSyncshellAliasToJoin;
     private readonly ConcurrentDictionary<string, GroupCommunityDto> _communityCache = new(StringComparer.Ordinal);
     private readonly ConcurrentDictionary<string, bool> _communityLoading = new(StringComparer.Ordinal);
+    private readonly Dictionary<string, DrawGroupPair> _groupPairRowCache = new(StringComparer.Ordinal);
 
     public GroupPanel(SnowMediator mediator, ApiController apiController, DalamudUtilService dalamudUtilService, PairManager pairManager,
         UidDisplayHandler uidDisplayHandler, SnowcloakConfigService snowcloakConfig, NotesStore notesStore, ShellConfigStore shellConfigStore,
@@ -579,13 +580,7 @@ private void DrawSyncshell(GroupFullInfoDto groupDto, List<Pair> pairsInGroup)
                     continue;
                 }
 
-                var drawPair = new DrawGroupPair(
-                    groupDto.GID + pair.UserData.UID, pair,
-                    ApiController, _mediator, groupDto,
-                    groupPairInfo,
-                    _uidDisplayHandler,
-                    _charaDataManager,
-                    _snowcloakConfig);
+                var drawPair = GetGroupPairRow(groupDto, pair, groupPairInfo);
 
                 bool pausedByYou;
                 bool pausedByOther;
@@ -654,6 +649,28 @@ private void DrawSyncshell(GroupFullInfoDto groupDto, List<Pair> pairsInGroup)
         ImGui.Unindent(20);
     }
 
+    private DrawGroupPair GetGroupPairRow(GroupFullInfoDto groupDto, Pair pair, GroupPairFullInfoDto groupPairInfo)
+    {
+        var id = groupDto.GID + pair.UserData.UID;
+        if (!_groupPairRowCache.TryGetValue(id, out var row)
+            || !ReferenceEquals(row.Pair, pair)
+            || !ReferenceEquals(row.Group, groupDto)
+            || !ReferenceEquals(row.GroupPairInfo, groupPairInfo))
+        {
+            row = new DrawGroupPair(id, pair, ApiController, _mediator, groupDto, groupPairInfo,
+                _uidDisplayHandler, _charaDataManager, _snowcloakConfig);
+            _groupPairRowCache[id] = row;
+        }
+
+        return row;
+    }
+
+    private void PruneGroupPairRowCache(int activeEntryCount)
+    {
+        if (_groupPairRowCache.Count > activeEntryCount * 4 + 64)
+            _groupPairRowCache.Clear();
+    }
+
     private void DrawGroupCommunity(GroupFullInfoDto groupDto)
     {
         var community = GetCommunity(groupDto);
@@ -1066,15 +1083,17 @@ private void DrawSyncShellButtons(GroupFullInfoDto groupDto, List<Pair> groupPai
     private void DrawSyncshellList(float contentWidth, float ySize)
     {
         ImGui.BeginChild("list", new Vector2(contentWidth, ySize), border: false);
+        var groups = _pairManager.GroupPairs.OrderBy(g => g.Key.Group.AliasOrGID, StringComparer.OrdinalIgnoreCase).ToList();
         using (ImRaii.PushStyle(ImGuiStyleVar.FramePadding, new Vector2(ImGui.GetStyle().FramePadding.X, 7f * ImGuiHelpers.GlobalScale)))
         using (ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, new Vector2(ImGui.GetStyle().ItemSpacing.X, 2f * ImGuiHelpers.GlobalScale)))
         {
-            foreach (var entry in _pairManager.GroupPairs.OrderBy(g => g.Key.Group.AliasOrGID, StringComparer.OrdinalIgnoreCase).ToList())
+            foreach (var entry in groups)
             {
                 using (ImRaii.PushId(entry.Key.Group.GID)) DrawSyncshell(entry.Key, entry.Value);
             }
         }
         ImGui.EndChild();
+        PruneGroupPairRowCache(groups.Sum(g => g.Value.Count));
     }
 
 }