GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'xxSeys1-MoreSearchableCM'

Browse Source
This commit is contained in:
Wojtek Figat
2025-08-19 18:20:04 +02:00
parent 0bc242c738 0fabca19cd
commit 45f6ef29e9
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Source/Editor/Windows/Assets/VisualScriptWindow.cs
View File

@@ -2,7 +2,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Xml; using System.Xml;
@@ -471,7 +470,7 @@ namespace FlaxEditor.Windows.Assets
private void OnOverrideMethodClicked() private void OnOverrideMethodClicked()
{ {
var cm = new ContextMenu(); var cm = new ItemsListContextMenu(235);
var window = (VisualScriptWindow)Values[0]; var window = (VisualScriptWindow)Values[0];
var scriptMeta = window.Asset.Meta; var scriptMeta = window.Asset.Meta;
var baseType = TypeUtils.GetType(scriptMeta.BaseTypename); var baseType = TypeUtils.GetType(scriptMeta.BaseTypename);
@@ -499,27 +498,39 @@ namespace FlaxEditor.Windows.Assets
if (isAlreadyAdded) if (isAlreadyAdded)
continue; continue;
var cmButton = cm.AddButton($"{name} (in {member.DeclaringType.Name})"); var item = new ItemsListContextMenu.Item
cmButton.TooltipText = Editor.Instance.CodeDocs.GetTooltip(member);
cmButton.Clicked += () =>
{ {
var surface = ((VisualScriptWindow)Values[0]).Surface; Name = $"{name} (in {member.DeclaringType.Name})",
var surfaceBounds = surface.AllNodesBounds; TooltipText = Editor.Instance.CodeDocs.GetTooltip(member),
surface.ShowArea(new Rectangle(surfaceBounds.BottomLeft, new Float2(200, 150)).MakeExpanded(400.0f)); Tag = new object[] { name, parameters.Length, Utils.GetEmptyArray<byte>() },
var node = surface.Context.SpawnNode(16, 3, surfaceBounds.BottomLeft + new Float2(0, 50), new object[] // Do some basic sorting based on if the method is defined directly in the script base class
{ SortScore = member.DeclaringType == member.Type.ReflectedType ? 1 : 0,
name,
parameters.Length,
Utils.GetEmptyArray<byte>()
});
surface.Select(node);
}; };
cm.AddItem(item);
} }
} }
if (!cm.Items.Any())
cm.ItemClicked += (item) =>
{ {
cm.AddButton("Nothing to override"); var surface = ((VisualScriptWindow)Values[0]).Surface;
var surfaceBounds = surface.AllNodesBounds;
surface.ShowArea(new Rectangle(surfaceBounds.BottomLeft, new Float2(200, 150)).MakeExpanded(400.0f));
var node = surface.Context.SpawnNode(16, 3, surfaceBounds.BottomLeft + new Float2(0, 50), item.Tag as object[]);
surface.Select(node);
};
if (cm.ItemsPanel.ChildrenCount == 0)
{
var item = new ItemsListContextMenu.Item
{
Name = "Nothing to override"
};
item.Enabled = false;
cm.AddItem(item);
} }
cm.SortItems();
cm.Show(_overrideButton, new Float2(0, _overrideButton.Height)); cm.Show(_overrideButton, new Float2(0, _overrideButton.Height));
} }
} }