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

add vanity uid to UI

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-25 01:26:23 +02:00
parent 258d19711a
commit cbe45a8ad6
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareAPI

Submodule MareAPI updated: 37d4eb5b1d...645dd0b18f

2
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -422,7 +422,7 @@ public class CachedPlayer
Logger.Debug($"Player {PlayerName} changed, PenumbraRedraw is {RequestedPenumbraRedraw}"); Logger.Debug($"Player {PlayerName} changed, PenumbraRedraw is {RequestedPenumbraRedraw}");
if (!RequestedPenumbraRedraw && PlayerCharacter is not null) if (!RequestedPenumbraRedraw && PlayerCharacter is not null)
{ {
_currentCharacterEquipment.HasUnprocessedUpdate = false; _currentCharacterEquipment!.HasUnprocessedUpdate = false;
Logger.Debug($"Saving new Glamourer data"); Logger.Debug($"Saving new Glamourer data");
_lastGlamourerData = _ipcManager.GlamourerGetCharacterCustomization(PlayerCharacter!); _lastGlamourerData = _ipcManager.GlamourerGetCharacterCustomization(PlayerCharacter!);
} }

21
MareSynchronos/UI/CompactUI.cs
View File

@@ -132,7 +132,8 @@ namespace MareSynchronos.UI
var buttonSize = UiShared.GetIconButtonSize(pauseIcon); var buttonSize = UiShared.GetIconButtonSize(pauseIcon);
var trashButtonSize = UiShared.GetIconButtonSize(FontAwesomeIcon.Trash); var trashButtonSize = UiShared.GetIconButtonSize(FontAwesomeIcon.Trash);
var textSize = ImGui.CalcTextSize(entry.OtherUID); var entryUID = string.IsNullOrEmpty(entry.VanityUID) ? entry.OtherUID : entry.VanityUID;
var textSize = ImGui.CalcTextSize(entryUID);
var originalY = ImGui.GetCursorPosY(); var originalY = ImGui.GetCursorPosY();
var buttonSizes = buttonSize.Y + trashButtonSize.Y; var buttonSizes = buttonSize.Y + trashButtonSize.Y;
@@ -144,7 +145,7 @@ namespace MareSynchronos.UI
UiShared.ColorText(FontAwesomeIcon.ArrowUp.ToIconString(), ImGuiColors.DalamudRed); UiShared.ColorText(FontAwesomeIcon.ArrowUp.ToIconString(), ImGuiColors.DalamudRed);
ImGui.PopFont(); ImGui.PopFont();
UiShared.AttachToolTip(entry.OtherUID + " has not added you back"); UiShared.AttachToolTip(entryUID + " has not added you back");
} }
else if (entry.IsPaused || entry.IsPausedFromOthers) else if (entry.IsPaused || entry.IsPausedFromOthers)
{ {
@@ -152,7 +153,7 @@ namespace MareSynchronos.UI
UiShared.ColorText(FontAwesomeIcon.PauseCircle.ToIconString(), ImGuiColors.DalamudYellow); UiShared.ColorText(FontAwesomeIcon.PauseCircle.ToIconString(), ImGuiColors.DalamudYellow);
ImGui.PopFont(); ImGui.PopFont();
UiShared.AttachToolTip("Pairing status with " + entry.OtherUID + " is paused"); UiShared.AttachToolTip("Pairing status with " + entryUID + " is paused");
} }
else else
{ {
@@ -160,7 +161,7 @@ namespace MareSynchronos.UI
UiShared.ColorText(FontAwesomeIcon.Check.ToIconString(), ImGuiColors.ParsedGreen); UiShared.ColorText(FontAwesomeIcon.Check.ToIconString(), ImGuiColors.ParsedGreen);
ImGui.PopFont(); ImGui.PopFont();
UiShared.AttachToolTip("You are paired with " + entry.OtherUID); UiShared.AttachToolTip("You are paired with " + entryUID);
} }
var textIsUid = true; var textIsUid = true;
@@ -169,7 +170,7 @@ namespace MareSynchronos.UI
{ {
if (string.IsNullOrEmpty(playerText)) if (string.IsNullOrEmpty(playerText))
{ {
playerText = entry.OtherUID; playerText = entryUID;
} }
else else
{ {
@@ -178,7 +179,7 @@ namespace MareSynchronos.UI
} }
else else
{ {
playerText = entry.OtherUID; playerText = entryUID;
} }
ImGui.SameLine(); ImGui.SameLine();
@@ -189,7 +190,7 @@ namespace MareSynchronos.UI
ImGui.TextUnformatted(playerText); ImGui.TextUnformatted(playerText);
if (textIsUid) ImGui.PopFont(); if (textIsUid) ImGui.PopFont();
UiShared.AttachToolTip("Left click to switch between UID display and nick" + Environment.NewLine + UiShared.AttachToolTip("Left click to switch between UID display and nick" + Environment.NewLine +
"Right click to change nick for " + entry.OtherUID); "Right click to change nick for " + entryUID);
if (ImGui.IsItemClicked(ImGuiMouseButton.Left)) if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
{ {
var prevState = textIsUid; var prevState = textIsUid;
@@ -240,7 +241,7 @@ namespace MareSynchronos.UI
_apiController.PairedClients.Remove(entry); _apiController.PairedClients.Remove(entry);
} }
} }
UiShared.AttachToolTip("Hold CTRL and click to unpair permanently from " + entry.OtherUID); UiShared.AttachToolTip("Hold CTRL and click to unpair permanently from " + entryUID);
if (entry.IsSynced) if (entry.IsSynced)
{ {
@@ -251,8 +252,8 @@ namespace MareSynchronos.UI
_ = _apiController.SendPairedClientPauseChange(entry.OtherUID, !entry.IsPaused); _ = _apiController.SendPairedClientPauseChange(entry.OtherUID, !entry.IsPaused);
} }
UiShared.AttachToolTip(!entry.IsPaused UiShared.AttachToolTip(!entry.IsPaused
? "Pause pairing with " + entry.OtherUID ? "Pause pairing with " + entryUID
: "Resume pairing with " + entry.OtherUID); : "Resume pairing with " + entryUID);
} }
} }