diff --git a/MareSynchronos/PlayerData/Pairs/Pair.cs b/MareSynchronos/PlayerData/Pairs/Pair.cs index 1ca50bc..af1449e 100644 --- a/MareSynchronos/PlayerData/Pairs/Pair.cs +++ b/MareSynchronos/PlayerData/Pairs/Pair.cs @@ -235,11 +235,17 @@ public class Pair : DisposableMediatorSubscriberBase { string? noteOrName = GetNoteOrName(); - if (noteOrName != null) + if (_mareConfig.Current.SortSyncshellsByVRAM) + { + return($"0{LastAppliedApproximateVRAMBytes}"); + } + else if (noteOrName != null) { return $"0{noteOrName}"; - else + } + else { return $"9{UserData.AliasOrUID}"; - } + } + } public string GetPlayerNameHash() { diff --git a/MareSynchronos/UI/Components/DrawGroupPair.cs b/MareSynchronos/UI/Components/DrawGroupPair.cs index 0bff181..43106b4 100644 --- a/MareSynchronos/UI/Components/DrawGroupPair.cs +++ b/MareSynchronos/UI/Components/DrawGroupPair.cs @@ -20,7 +20,7 @@ public class DrawGroupPair : DrawPairBase private readonly GroupPairFullInfoDto _fullInfoDto; private readonly GroupFullInfoDto _group; private readonly CharaDataManager _charaDataManager; - public long VramUsage { get; set; } + public long VRAMUsage { get; set; } public DrawGroupPair(string id, Pair entry, ApiController apiController, MareMediator mareMediator, GroupFullInfoDto group, GroupPairFullInfoDto fullInfoDto, @@ -87,7 +87,6 @@ public class DrawGroupPair : DrawPairBase presenceText += "Files Size: " + UiSharedService.ByteToString(_pair.LastAppliedDataBytes, true); if (_pair.LastAppliedApproximateVRAMBytes >= 0) { - VramUsage = _pair.LastAppliedApproximateVRAMBytes; presenceText += Environment.NewLine + "Approx. VRAM Usage: " + UiSharedService.ByteToString(_pair.LastAppliedApproximateVRAMBytes, true); } if (_pair.LastAppliedDataTris >= 0) diff --git a/MareSynchronos/UI/Components/GroupPanel.cs b/MareSynchronos/UI/Components/GroupPanel.cs index 322712b..68e4ad6 100644 --- a/MareSynchronos/UI/Components/GroupPanel.cs +++ b/MareSynchronos/UI/Components/GroupPanel.cs @@ -427,12 +427,13 @@ internal sealed class GroupPanel var visibleUsers = new List(); var onlineUsers = new List(); var offlineUsers = new List(); - + + foreach (var pair in sortedPairs) { var drawPair = new DrawGroupPair( groupDto.GID + pair.UserData.UID, pair, - ApiController, _mainUi.Mediator, groupDto, + ApiController, _mainUi.Mediator, groupDto, pair.GroupPair.Single( g => GroupDataComparer.Instance.Equals(g.Key.Group, groupDto.Group) ).Value, @@ -452,16 +453,9 @@ internal sealed class GroupPanel { ImGui.TextUnformatted("Visible"); ImGui.Separator(); - if (_mareConfig.Current.SortSyncshellsByVRAM) - { - List sortedVisibleUsers = visibleUsers.OrderBy(o=>o.VramUsage).ToList(); - _uidDisplayHandler.RenderPairList(sortedVisibleUsers); - } - else - { - _uidDisplayHandler.RenderPairList(visibleUsers); + _uidDisplayHandler.RenderPairList(visibleUsers); - } + } if (onlineUsers.Count > 0)