Merge branch 'xxSeys1-LessCreateScriptItems'

This commit is contained in:
Wojtek Figat
2025-09-21 21:01:36 +02:00
2 changed files with 18 additions and 3 deletions

View File

@@ -36,6 +36,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
{ {
ScriptName = scriptName; ScriptName = scriptName;
TooltipText = "Create a new script"; TooltipText = "Create a new script";
DrawHighlights = false;
} }
} }
@@ -70,7 +71,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
var buttonHeight = (textSize.Y < 18) ? 18 : textSize.Y + 4; var buttonHeight = (textSize.Y < 18) ? 18 : textSize.Y + 4;
_addScriptsButton = new Button _addScriptsButton = new Button
{ {
TooltipText = "Add new scripts to the actor", TooltipText = "Add new scripts to the actor.",
AnchorPreset = AnchorPresets.MiddleCenter, AnchorPreset = AnchorPresets.MiddleCenter,
Text = buttonText, Text = buttonText,
Parent = this, Parent = this,
@@ -114,7 +115,16 @@ namespace FlaxEditor.CustomEditors.Dedicated
cm.TextChanged += text => cm.TextChanged += text =>
{ {
if (!IsValidScriptName(text)) if (!IsValidScriptName(text))
{
// Remove NewScriptItems
List<Control> newScriptItems = cm.ItemsPanel.Children.FindAll(c => c is NewScriptItem);
foreach (var item in newScriptItems)
{
cm.ItemsPanel.RemoveChild(item);
}
return; return;
}
if (!cm.ItemsPanel.Children.Any(x => x.Visible && x is not NewScriptItem)) if (!cm.ItemsPanel.Children.Any(x => x.Visible && x is not NewScriptItem))
{ {
// If there are no visible items, that means the search failed so we can find the create script button or create one if it's the first time // If there are no visible items, that means the search failed so we can find the create script button or create one if it's the first time
@@ -876,7 +886,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
// Add drag button to the group // Add drag button to the group
var scriptDrag = new DragImage var scriptDrag = new DragImage
{ {
TooltipText = "Script reference", TooltipText = "Script reference.",
AutoFocus = true, AutoFocus = true,
IsScrollable = false, IsScrollable = false,
Color = FlaxEngine.GUI.Style.Current.ForegroundGrey, Color = FlaxEngine.GUI.Style.Current.ForegroundGrey,

View File

@@ -51,6 +51,11 @@ namespace FlaxEditor.GUI
/// </summary> /// </summary>
public float SortScore; public float SortScore;
/// <summary>
/// Wether the query highlights should be draw.
/// </summary>
public bool DrawHighlights = true;
/// <summary> /// <summary>
/// Occurs when items gets clicked by the user. /// Occurs when items gets clicked by the user.
/// </summary> /// </summary>
@@ -165,7 +170,7 @@ namespace FlaxEditor.GUI
Render2D.FillRectangle(new Rectangle(Float2.Zero, Size), style.BackgroundHighlighted); Render2D.FillRectangle(new Rectangle(Float2.Zero, Size), style.BackgroundHighlighted);
// Draw all highlights // Draw all highlights
if (_highlights != null) if (DrawHighlights && _highlights != null)
{ {
var color = style.ProgressNormal * 0.6f; var color = style.ProgressNormal * 0.6f;
for (int i = 0; i < _highlights.Count; i++) for (int i = 0; i < _highlights.Count; i++)