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

Merge branch 'Tryibion-sel-prefab-clear-search'

Browse Source
This commit is contained in:
Wojtek Figat
2024-05-17 15:31:04 +02:00
parent f87dec6ca6 7f8700288f
commit 69ae841f64
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
View File

@@ -75,7 +75,11 @@ namespace FlaxEditor.CustomEditors.Dedicated
// Selecting actor prefab asset // Selecting actor prefab asset
var selectPrefab = panel.Button("Select Prefab"); var selectPrefab = panel.Button("Select Prefab");
selectPrefab.Button.Clicked += () => Editor.Instance.Windows.ContentWin.Select(prefab); selectPrefab.Button.Clicked += () =>
{
Editor.Instance.Windows.ContentWin.ClearItemsSearch();
Editor.Instance.Windows.ContentWin.Select(prefab);
};
// Viewing changes applied to this actor // Viewing changes applied to this actor
var viewChanges = panel.Button("View Changes"); var viewChanges = panel.Button("View Changes");

1
Source/Editor/Modules/PrefabsModule.cs
View File

@@ -202,6 +202,7 @@ namespace FlaxEditor.Modules
var prefabId = ((ActorNode)selection[0]).Actor.PrefabID; var prefabId = ((ActorNode)selection[0]).Actor.PrefabID;
var prefab = FlaxEngine.Content.LoadAsync<Prefab>(prefabId); var prefab = FlaxEngine.Content.LoadAsync<Prefab>(prefabId);
Editor.Windows.ContentWin.ClearItemsSearch();
Editor.Windows.ContentWin.Select(prefab); Editor.Windows.ContentWin.Select(prefab);
} }

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

@@ -131,7 +131,7 @@ namespace FlaxEditor.Windows
public void ClearItemsSearch() public void ClearItemsSearch()
{ {
// Skip if already cleared // Skip if already cleared
if (_itemsSearchBox.TextLength == 0 && !_viewDropdown.HasSelection) if (_itemsSearchBox.TextLength == 0)
return; return;
IsLayoutLocked = true; IsLayoutLocked = true;