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

Merge branch 'xxSeys1-NoClearSearchboxesWhenStuffHappens'

Browse Source
This commit is contained in:
Wojtek Figat
2025-09-21 21:06:21 +02:00
parent bb180b0f59 1186833b2d
commit 7da5ce3ed4
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Editor/Windows/ContentWindow.Search.cs
View File

@@ -115,6 +115,7 @@ namespace FlaxEditor.Windows
var root = _root; var root = _root;
root.LockChildrenRecursive(); root.LockChildrenRecursive();
PerformLayout();
// Update tree // Update tree
var query = _foldersSearchBox.Text; var query = _foldersSearchBox.Text;

2
Source/Editor/Windows/ContentWindow.cs
View File

@@ -1085,6 +1085,8 @@ namespace FlaxEditor.Windows
if (Editor.ContentDatabase.Find(_lastViewedFolderBeforeReload) is ContentFolder folder) if (Editor.ContentDatabase.Find(_lastViewedFolderBeforeReload) is ContentFolder folder)
_tree.Select(folder.Node); _tree.Select(folder.Node);
} }
OnFoldersSearchBoxTextChanged();
} }
private void Refresh() private void Refresh()

5
Source/Editor/Windows/SceneTreeWindow.cs
View File

@@ -68,6 +68,7 @@ namespace FlaxEditor.Windows
TooltipText = "Search the scene tree.\n\nYou can prefix your search with different search operators:\ns: -> Actor with script of type\na: -> Actor type\nc: -> Control type", TooltipText = "Search the scene tree.\n\nYou can prefix your search with different search operators:\ns: -> Actor with script of type\na: -> Actor type\nc: -> Control type",
}; };
_searchBox.TextChanged += OnSearchBoxTextChanged; _searchBox.TextChanged += OnSearchBoxTextChanged;
ScriptsBuilder.ScriptsReloadEnd += OnSearchBoxTextChanged;
// Scene tree panel // Scene tree panel
_sceneTreePanel = new Panel _sceneTreePanel = new Panel
@@ -125,6 +126,7 @@ namespace FlaxEditor.Windows
{ {
base.OnPlayBegin(); base.OnPlayBegin();
_blockSceneTreeScroll = false; _blockSceneTreeScroll = false;
OnSearchBoxTextChanged();
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -139,6 +141,7 @@ namespace FlaxEditor.Windows
{ {
base.OnPlayEnd(); base.OnPlayEnd();
_blockSceneTreeScroll = true; _blockSceneTreeScroll = true;
OnSearchBoxTextChanged();
} }
/// <summary> /// <summary>
@@ -174,6 +177,7 @@ namespace FlaxEditor.Windows
return; return;
_tree.LockChildrenRecursive(); _tree.LockChildrenRecursive();
PerformLayout();
// Update tree // Update tree
var query = _searchBox.Text; var query = _searchBox.Text;
@@ -599,6 +603,7 @@ namespace FlaxEditor.Windows
_dragHandlers = null; _dragHandlers = null;
_tree = null; _tree = null;
_searchBox = null; _searchBox = null;
ScriptsBuilder.ScriptsReloadEnd -= OnSearchBoxTextChanged;
base.OnDestroy(); base.OnDestroy();
} }