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

Merge branch 'master' into 1.5

Browse Source 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/Utilities/Utils.cs
This commit is contained in:
Wojtek Figat
2022-12-28 16:59:11 +01:00
parent 7859e64db1 3a393b6825
commit 8762e8ad15
54 changed files with 245 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/Utilities/Utils.cs
View File

@@ -14,6 +14,7 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Input;
using FlaxEditor.GUI.Tree;
using FlaxEditor.SceneGraph;
using FlaxEditor.Scripting;
@@ -957,10 +958,9 @@ namespace FlaxEditor.Utilities
{
Size = new Float2(320, 220 + headerHeight),
};
searchBox = new TextBox(false, 1, headerHeight + 1)
searchBox = new SearchBox(false, 1, headerHeight + 1)
{
Width = menu.Width - 3,
WatermarkText = "Search...",
Parent = menu,
};
var panel1 = new Panel(ScrollBars.Vertical)