Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix context menu bugs (#5527)

Browse Source
This commit is contained in:
Leon Friedrich
2021-11-26 18:00:28 +13:00
committed by GitHub
parent 3447956088
commit 17560de3c7
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/ContextMenu/UI/EntityMenuPresenter.cs
View File

@@ -321,7 +321,7 @@ namespace Content.Client.ContextMenu.UI
}
/// <summary>
/// Look through a sub-menu and return the first entity.
/// Recursively look through a sub-menu and return the first entity.
/// </summary>
private IEntity? GetFirstEntityOrNull(ContextMenuPopup? menu)
{
@@ -334,8 +334,13 @@ namespace Content.Client.ContextMenu.UI
continue;
if (entityElement.Entity != null)
return entityElement.Entity;
{
if (!entityElement.Entity.Deleted)
return entityElement.Entity;
continue;
}
// if the element has no entity, its a group of entities with another attached sub-menu.
var entity = GetFirstEntityOrNull(entityElement.SubMenu);
if (entity != null)
return entity;