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

add display of usernames to group ui

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-30 11:51:05 +01:00
parent 66fb103c94
commit 422caade5e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/UI/CompactUI.cs
View File

@@ -90,7 +90,7 @@ public class CompactUi : Window, IDisposable
_serverManager = serverManager; _serverManager = serverManager;
_tagHandler = new(_serverManager); _tagHandler = new(_serverManager);
_groupPanel = new(this, uiShared, _pairManager, _serverManager); _groupPanel = new(this, uiShared, _pairManager, _serverManager, _configService);
_selectGroupForPairUi = new(_tagHandler); _selectGroupForPairUi = new(_tagHandler);
_selectPairsForGroupUi = new(_tagHandler); _selectPairsForGroupUi = new(_tagHandler);
_pairGroupsUi = new(_tagHandler, DrawPairedClient, apiController, _selectPairsForGroupUi); _pairGroupsUi = new(_tagHandler, DrawPairedClient, apiController, _selectPairsForGroupUi);

11
MareSynchronos/UI/GroupPanel.cs
View File

@@ -14,6 +14,7 @@ using MareSynchronos.API.Data.Extensions;
using MareSynchronos.Managers; using MareSynchronos.Managers;
using MareSynchronos.Models; using MareSynchronos.Models;
using MareSynchronos.API.Data.Comparer; using MareSynchronos.API.Data.Comparer;
using MareSynchronos.MareConfiguration;
namespace MareSynchronos.UI namespace MareSynchronos.UI
{ {
@@ -24,6 +25,7 @@ namespace MareSynchronos.UI
private ApiController ApiController => _uiShared.ApiController; private ApiController ApiController => _uiShared.ApiController;
private readonly PairManager _pairManager; private readonly PairManager _pairManager;
private readonly ServerConfigurationManager _serverConfigurationManager; private readonly ServerConfigurationManager _serverConfigurationManager;
private readonly ConfigurationService _configService;
private readonly Dictionary<string, bool> _showGidForEntry = new(StringComparer.Ordinal); private readonly Dictionary<string, bool> _showGidForEntry = new(StringComparer.Ordinal);
private string _editGroupEntry = string.Empty; private string _editGroupEntry = string.Empty;
private string _editGroupComment = string.Empty; private string _editGroupComment = string.Empty;
@@ -51,12 +53,13 @@ namespace MareSynchronos.UI
private bool _modalChangePwOpened; private bool _modalChangePwOpened;
private int _bulkInviteCount = 10; private int _bulkInviteCount = 10;
public GroupPanel(CompactUi mainUi, UiShared uiShared, PairManager pairManager, ServerConfigurationManager serverConfigurationManager) public GroupPanel(CompactUi mainUi, UiShared uiShared, PairManager pairManager, ServerConfigurationManager serverConfigurationManager, ConfigurationService configurationService)
{ {
_mainUi = mainUi; _mainUi = mainUi;
_uiShared = uiShared; _uiShared = uiShared;
_pairManager = pairManager; _pairManager = pairManager;
_serverConfigurationManager = serverConfigurationManager; _serverConfigurationManager = serverConfigurationManager;
_configService = configurationService;
} }
public void DrawSyncshells() public void DrawSyncshells()
@@ -833,6 +836,12 @@ namespace MareSynchronos.UI
playerText = entryUID; playerText = entryUID;
} }
if (_configService.Current.ShowCharacterNameInsteadOfNotesForVisible && pair.IsVisible && !showUidInsteadOfName)
{
playerText = pair.PlayerName;
textIsUid = false;
}
bool plusButtonShown = !_pairManager.DirectPairs.Any(p => string.Equals(p.UserData.UID, entry.UID, StringComparison.Ordinal)); bool plusButtonShown = !_pairManager.DirectPairs.Any(p => string.Equals(p.UserData.UID, entry.UID, StringComparison.Ordinal));
ImGui.SameLine(); ImGui.SameLine();