t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort named players above UIDs

Browse Source
This commit is contained in:
Loporrit
2025-02-23 12:29:29 +00:00
parent 250f61ad85
commit 57fbf2b983
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MareSynchronos/PlayerData/Pairs/Pair.cs
View File

@@ -231,6 +231,16 @@ public class Pair : DisposableMediatorSubscriberBase
return note; return note;
} }
public string GetPairSortKey()
{
string? noteOrName = GetNoteOrName();
if (noteOrName != null)
return $"0{noteOrName}";
else
return $"9{UserData.AliasOrUID}";
}
public string GetPlayerNameHash() public string GetPlayerNameHash()
{ {
return CachedPlayer?.PlayerNameHash ?? string.Empty; return CachedPlayer?.PlayerNameHash ?? string.Empty;

2
MareSynchronos/UI/CompactUI.cs
View File

@@ -369,7 +369,7 @@ public class CompactUi : WindowMediatorSubscriberBase
var ySize = TransferPartHeight == 0 var ySize = TransferPartHeight == 0
? 1 ? 1
: (ImGui.GetWindowContentRegionMax().Y - ImGui.GetWindowContentRegionMin().Y) - TransferPartHeight - ImGui.GetCursorPosY(); : (ImGui.GetWindowContentRegionMax().Y - ImGui.GetWindowContentRegionMin().Y) - TransferPartHeight - ImGui.GetCursorPosY();
var users = GetFilteredUsers().OrderBy(u => u.GetNoteOrName()); var users = GetFilteredUsers().OrderBy(u => u.GetPairSortKey());
var onlineUsers = users.Where(u => u.UserPair!.OtherPermissions.IsPaired() && (u.IsOnline || u.UserPair!.OwnPermissions.IsPaused())).Select(c => new DrawUserPair("Online" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService)).ToList(); var onlineUsers = users.Where(u => u.UserPair!.OtherPermissions.IsPaired() && (u.IsOnline || u.UserPair!.OwnPermissions.IsPaused())).Select(c => new DrawUserPair("Online" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService)).ToList();
var visibleUsers = users.Where(u => u.IsVisible).Select(c => new DrawUserPair("Visible" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService)).ToList(); var visibleUsers = users.Where(u => u.IsVisible).Select(c => new DrawUserPair("Visible" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService)).ToList();

4
MareSynchronos/UI/Components/GroupPanel.cs
View File

@@ -420,7 +420,7 @@ internal sealed class GroupPanel
.OrderByDescending(u => string.Equals(u.UserData.UID, groupDto.OwnerUID, StringComparison.Ordinal)) .OrderByDescending(u => string.Equals(u.UserData.UID, groupDto.OwnerUID, StringComparison.Ordinal))
.ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsModerator()) .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsModerator())
.ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsPinned()) .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsPinned())
.ThenBy(u => u.GetNoteOrName() ?? u.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase); .ThenBy(u => u.GetPairSortKey(), StringComparer.OrdinalIgnoreCase);
var visibleUsers = new List<DrawGroupPair>(); var visibleUsers = new List<DrawGroupPair>();
var onlineUsers = new List<DrawGroupPair>(); var onlineUsers = new List<DrawGroupPair>();
@@ -465,7 +465,7 @@ internal sealed class GroupPanel
ImGui.Separator(); ImGui.Separator();
if (hideOfflineUsers) if (hideOfflineUsers)
{ {
UiSharedService.ColorText($" {offlineUsers.Count} users omitted from display.", ImGuiColors.DalamudGrey); UiSharedService.ColorText($" {offlineUsers.Count} offline users omitted from display.", ImGuiColors.DalamudGrey);
} }
else else
{ {