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

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

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
Wojtek Figat
2023-02-16 09:54:22 +01:00
parent c4b7f50609 ac368863aa
commit 30fa911832
47 changed files with 381 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/Windows/Assets/PrefabWindow.cs
View File

@@ -235,14 +235,14 @@ namespace FlaxEditor.Windows.Assets
if (IsLayoutLocked)
return;
var root = Graph.Root;
root.TreeNode.LockChildrenRecursive();
_tree.LockChildrenRecursive();
// Update tree
var query = _searchBox.Text;
var root = Graph.Root;
root.TreeNode.UpdateFilter(query);
root.TreeNode.UnlockChildrenRecursive();
_tree.UnlockChildrenRecursive();
PerformLayout();
PerformLayout();
}

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

@@ -123,14 +123,14 @@ namespace FlaxEditor.Windows
if (IsLayoutLocked)
return;
var root = Editor.Scene.Root;
root.TreeNode.LockChildrenRecursive();
_tree.LockChildrenRecursive();
// Update tree
var query = _searchBox.Text;
var root = Editor.Scene.Root;
root.TreeNode.UpdateFilter(query);
root.TreeNode.UnlockChildrenRecursive();
_tree.UnlockChildrenRecursive();
PerformLayout();
PerformLayout();
}
@@ -251,7 +251,7 @@ namespace FlaxEditor.Windows
if (nodes.Count == 1)
{
nodes[0].ExpandAllParents(true);
ScrollViewTo(nodes[0]);
_sceneTreePanel.ScrollViewTo(nodes[0]);
}
}