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

Merge branch 'category-rework' of https://github.com/Tryibion/FlaxEngine into Tryibion-category-rework

Browse Source
This commit is contained in:
Wojtek Figat
2024-02-27 11:08:33 +01:00
parent f1b133bd60 0a7662a37b
commit f1bc161ad2
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Editor/GUI/ItemsListContextMenu.cs
View File

@@ -134,9 +134,13 @@ namespace FlaxEditor.GUI
Render2D.FillRectangle(rect, color); Render2D.FillRectangle(rect, color);
} }
} }
// Indent for drop panel items is handled by drop panel margin
var indent = Float2.Zero;
if (Parent is not DropPanel)
indent = new Float2(Editor.Instance.Icons.ArrowRight12.Size.X + 2, 0);
// Draw name // Draw name
Render2D.DrawText(style.FontSmall, Name, textRect, TintColor * (Enabled ? style.Foreground : style.ForegroundDisabled), TextAlignment.Near, TextAlignment.Center); Render2D.DrawText(style.FontSmall, Name, textRect + indent, TintColor * (Enabled ? style.Foreground : style.ForegroundDisabled), TextAlignment.Near, TextAlignment.Center);
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -262,6 +266,10 @@ namespace FlaxEditor.GUI
} }
} }
category.Visible = anyVisible; category.Visible = anyVisible;
if (string.IsNullOrEmpty(_searchBox.Text))
category.Close(false);
else
category.Open(false);
} }
} }
@@ -338,9 +346,14 @@ namespace FlaxEditor.GUI
var categoryPanel = new DropPanel var categoryPanel = new DropPanel
{ {
HeaderText = item.Category, HeaderText = item.Category,
ArrowImageOpened = new SpriteBrush(Editor.Instance.Icons.ArrowDown12),
ArrowImageClosed = new SpriteBrush(Editor.Instance.Icons.ArrowRight12),
EnableDropDownIcon = true,
ItemsMargin = new Margin(28, 0, 2, 2),
HeaderColor = Style.Current.Background,
Parent = parent, Parent = parent,
}; };
categoryPanel.Open(false); categoryPanel.Close(false);
_categoryPanels.Add(categoryPanel); _categoryPanels.Add(categoryPanel);
parent = categoryPanel; parent = categoryPanel;
} }
@@ -382,6 +395,7 @@ namespace FlaxEditor.GUI
item2.UpdateFilter(null); item2.UpdateFilter(null);
} }
category.Visible = true; category.Visible = true;
category.Close(false);
} }
} }

2
Source/Engine/AI/Behavior.h
View File

@@ -11,7 +11,7 @@
/// <summary> /// <summary>
/// Behavior instance script that runs Behavior Tree execution. /// Behavior instance script that runs Behavior Tree execution.
/// </summary> /// </summary>
API_CLASS() class FLAXENGINE_API Behavior : public Script API_CLASS(Attributes="Category(\"Flax Engine\")") class FLAXENGINE_API Behavior : public Script
{ {
API_AUTO_SERIALIZATION(); API_AUTO_SERIALIZATION();
DECLARE_SCRIPTING_TYPE(Behavior); DECLARE_SCRIPTING_TYPE(Behavior);

2
Source/Engine/Networking/Components/NetworkTransform.h
View File

@@ -10,7 +10,7 @@
/// Actor script component that synchronizes the Transform over the network. /// Actor script component that synchronizes the Transform over the network.
/// </summary> /// </summary>
/// <remarks>Interpolation and prediction logic based on https://www.gabrielgambetta.com/client-server-game-architecture.html.</remarks> /// <remarks>Interpolation and prediction logic based on https://www.gabrielgambetta.com/client-server-game-architecture.html.</remarks>
API_CLASS(Namespace="FlaxEngine.Networking") class FLAXENGINE_API NetworkTransform : public Script, public INetworkSerializable API_CLASS(Namespace="FlaxEngine.Networking", Attributes="Category(\"Flax Engine\")") class FLAXENGINE_API NetworkTransform : public Script, public INetworkSerializable
{ {
API_AUTO_SERIALIZATION(); API_AUTO_SERIALIZATION();
DECLARE_SCRIPTING_TYPE(NetworkTransform); DECLARE_SCRIPTING_TYPE(NetworkTransform);