tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change VerbMenu categories to only execute solitary verbs (#6100)

Browse Source 
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
This commit is contained in:
ShadowCommander
2022-01-10 19:34:49 -08:00
committed by GitHub
parent 6f7cd29fb5
commit adcdcaa4e4
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Verbs/UI/VerbMenuPresenter.cs
View File

@@ -172,6 +172,7 @@ namespace Content.Client.Verbs.UI
if (element is not VerbMenuElement verbElement)
return;
args.Handle();
var verb = verbElement.Verb;
if (verb == null)
@@ -182,8 +183,12 @@ namespace Content.Client.Verbs.UI
if (verbElement.SubMenu == null || verbElement.SubMenu.ChildCount == 0)
return;
if (verbElement.SubMenu.MenuBody.Children.First() is not VerbMenuElement verbCategoryElement)
if (verbElement.SubMenu.MenuBody.ChildCount != 1
|| verbElement.SubMenu.MenuBody.Children.First() is not VerbMenuElement verbCategoryElement)
{
OpenSubMenu(verbElement);
return;
}
verb = verbCategoryElement.Verb;
@@ -194,8 +199,6 @@ namespace Content.Client.Verbs.UI
_verbSystem.ExecuteVerb(CurrentTarget, verb, verbElement.Type);
if (verb.CloseMenu)
_verbSystem.CloseAllMenus();
args.Handle();
}
}
}