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

25
Content.Client/ContextMenu/UI/ContextMenuPresenter.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Threading;
using Robust.Client.UserInterface;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Timer = Robust.Shared.Timing.Timer;
namespace Content.Client.ContextMenu.UI
@@ -71,6 +72,10 @@ namespace Content.Client.ContextMenu.UI
{
Menus.Pop().Close();
}
// ensure no accidental double-closing happens.
CancelClose?.Cancel();
CancelClose = null;
}
/// <summary>
@@ -78,7 +83,11 @@ namespace Content.Client.ContextMenu.UI
/// </summary>
public virtual void OnMouseEntered(ContextMenuElement element)
{
var topMenu = Menus.Peek();
if (!Menus.TryPeek(out var topMenu))
{
Logger.Error("Context Menu: Mouse entered menu without any open menus?");
return;
}
if (element.ParentMenu == topMenu || element.SubMenu == topMenu)
CancelClose?.Cancel();
@@ -120,8 +129,14 @@ namespace Content.Client.ContextMenu.UI
/// </remarks>
public virtual void OpenSubMenu(ContextMenuElement element)
{
if (!Menus.TryPeek(out var topMenu))
{
Logger.Error("Context Menu: Attempting to open sub menu without any open menus?");
return;
}
// If This is already the top most menu, do nothing.
if (element.SubMenu == Menus.Peek())
if (element.SubMenu == topMenu)
return;
// Was the parent menu closed or disposed before an open timer completed?
@@ -131,6 +146,10 @@ namespace Content.Client.ContextMenu.UI
// Close any currently open sub-menus up to this element's parent menu.
CloseSubMenus(element.ParentMenu);
// cancel any queued openings to prevent weird double-open scenarios.
CancelOpen?.Cancel();
CancelOpen = null;
if (element.SubMenu == null)
return;
@@ -139,8 +158,6 @@ namespace Content.Client.ContextMenu.UI
var altPos = element.GlobalPosition;
var pos = altPos + (element.Width + 2*ContextMenuElement.ElementMargin, - 2*ContextMenuElement.ElementMargin);
element.SubMenu.Open(UIBox2.FromDimensions(pos, (1, 1)), altPos);
element.SubMenu.Close();
element.SubMenu.Open(UIBox2.FromDimensions(pos, (1, 1)), altPos);
// draw on top of other menus
element.SubMenu.SetPositionLast();