From 5815b5c2e5cd56c7df6d498b66a3c314dfd7f4aa Mon Sep 17 00:00:00 2001 From: Loporrit <141286461+loporrit@users.noreply.github.com> Date: Mon, 28 Oct 2024 00:38:28 +0000 Subject: [PATCH] Re-enable context menus finally... --- MareSynchronos/PlayerData/Pairs/Pair.cs | 35 ++++++++++++++----------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/MareSynchronos/PlayerData/Pairs/Pair.cs b/MareSynchronos/PlayerData/Pairs/Pair.cs index 1cb3165..7a09411 100644 --- a/MareSynchronos/PlayerData/Pairs/Pair.cs +++ b/MareSynchronos/PlayerData/Pairs/Pair.cs @@ -59,36 +59,39 @@ public class Pair public void AddContextMenu(IMenuOpenedArgs args) { - if (CachedPlayer == null || true /* TODO: Check target */ || IsPaused) return; + if (CachedPlayer == null || (args.Target is not MenuTargetDefault target) || target.TargetObjectId != CachedPlayer.PlayerCharacterId || IsPaused) return; args.AddMenuItem(new MenuItem() { Name = "Open Profile", OnClicked = (a) => _mediator.Publish(new ProfileOpenStandaloneMessage(this)), PrefixColor = 559, - PrefixChar = '', + PrefixChar = 'L' }); args.AddMenuItem(new MenuItem() { Name = "Reapply last data", OnClicked = (a) => ApplyLastReceivedData(forced: true), PrefixColor = 559, - PrefixChar = '', + PrefixChar = 'L', }); - args.AddMenuItem(new MenuItem() + if (UserPair != null) { - Name = "Change Permissions", - OnClicked = (a) => _mediator.Publish(new OpenPermissionWindow(this)), - PrefixColor = 559, - PrefixChar = '', - }); - args.AddMenuItem(new MenuItem() - { - Name = "Cycle pause state", - OnClicked = (a) => _mediator.Publish(new CyclePauseMessage(UserData)), - PrefixColor = 559, - PrefixChar = '', - }); + args.AddMenuItem(new MenuItem() + { + Name = "Change Permissions", + OnClicked = (a) => _mediator.Publish(new OpenPermissionWindow(this)), + PrefixColor = 559, + PrefixChar = 'L', + }); + args.AddMenuItem(new MenuItem() + { + Name = "Cycle pause state", + OnClicked = (a) => _mediator.Publish(new CyclePauseMessage(UserData)), + PrefixColor = 559, + PrefixChar = 'L', + }); + } } public void ApplyData(OnlineUserCharaDataDto data)