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

Merge remote-tracking branch 'origin/master' into 1.11

Browse Source
This commit is contained in:
Wojtek Figat
2025-09-30 18:26:14 +02:00
parent 32f2ef3f06 537d8b57ca
commit 93219793d5
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,6 @@ 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,8 +1085,6 @@ 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()

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

@@ -68,7 +68,6 @@ 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
@@ -113,7 +112,7 @@ namespace FlaxEditor.Windows
InputActions.Add(options => options.LockFocusSelection, () => Editor.Windows.EditWin.Viewport.LockFocusSelection()); InputActions.Add(options => options.LockFocusSelection, () => Editor.Windows.EditWin.Viewport.LockFocusSelection());
InputActions.Add(options => options.Rename, RenameSelection); InputActions.Add(options => options.Rename, RenameSelection);
} }
/// <inheritdoc /> /// <inheritdoc />
public override void OnPlayBeginning() public override void OnPlayBeginning()
{ {
@@ -126,7 +125,6 @@ namespace FlaxEditor.Windows
{ {
base.OnPlayBegin(); base.OnPlayBegin();
_blockSceneTreeScroll = false; _blockSceneTreeScroll = false;
OnSearchBoxTextChanged();
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -141,7 +139,6 @@ namespace FlaxEditor.Windows
{ {
base.OnPlayEnd(); base.OnPlayEnd();
_blockSceneTreeScroll = true; _blockSceneTreeScroll = true;
OnSearchBoxTextChanged();
} }
/// <summary> /// <summary>
@@ -177,7 +174,6 @@ namespace FlaxEditor.Windows
return; return;
_tree.LockChildrenRecursive(); _tree.LockChildrenRecursive();
PerformLayout();
// Update tree // Update tree
var query = _searchBox.Text; var query = _searchBox.Text;
@@ -603,7 +599,6 @@ namespace FlaxEditor.Windows
_dragHandlers = null; _dragHandlers = null;
_tree = null; _tree = null;
_searchBox = null; _searchBox = null;
ScriptsBuilder.ScriptsReloadEnd -= OnSearchBoxTextChanged;
base.OnDestroy(); base.OnDestroy();
} }