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

Add displaying file extension for scripts in content finder to distinguish C++ files

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-18 14:18:52 +02:00
parent 736119fdc6
commit 5e0d90af2e
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/GUI/Popups/AssetSearchPopup.cs
View File

@@ -38,7 +38,7 @@ namespace FlaxEditor.GUI
ContentItem = item; ContentItem = item;
ContentItem.AddReference(this); ContentItem.AddReference(this);
Name = item.ShortName; OnItemRenamed(item);
TooltipText = item.Path; TooltipText = item.Path;
Height = IconSize + 4; Height = IconSize + 4;
@@ -82,7 +82,9 @@ namespace FlaxEditor.GUI
/// <inheritdoc /> /// <inheritdoc />
public void OnItemRenamed(ContentItem item) public void OnItemRenamed(ContentItem item)
{ {
Name = ContentItem.ShortName; Name = item.ShortName;
if (item is ScriptItem)
Name = item.FileName; // Show extension for scripts (esp. for .h and .cpp files of the same name)
} }
/// <inheritdoc /> /// <inheritdoc />

12
Source/Editor/Modules/ContentFindingModule.cs
View File

@@ -342,9 +342,10 @@ namespace FlaxEditor.Modules
{ {
foreach (var contentItem in items) foreach (var contentItem in items)
{ {
var name = contentItem.ShortName;
if (contentItem.IsAsset) if (contentItem.IsAsset)
{ {
if (nameRegex.Match(contentItem.ShortName).Success) if (nameRegex.Match(name).Success)
{ {
var asset = contentItem as AssetItem; var asset = contentItem as AssetItem;
if (asset == null || !typeRegex.Match(asset.TypeName).Success) if (asset == null || !typeRegex.Match(asset.TypeName).Success)
@@ -358,7 +359,7 @@ namespace FlaxEditor.Modules
var splits = asset.TypeName.Split('.'); var splits = asset.TypeName.Split('.');
finalName = splits[splits.Length - 1]; finalName = splits[splits.Length - 1];
} }
matches.Add(new SearchResult { Name = asset.ShortName, Type = finalName, Item = asset }); matches.Add(new SearchResult { Name = name, Type = finalName, Item = asset });
} }
} }
else if (contentItem.IsFolder) else if (contentItem.IsFolder)
@@ -370,11 +371,12 @@ namespace FlaxEditor.Modules
} }
else else
{ {
if (nameRegex.Match(contentItem.ShortName).Success && typeRegex.Match(contentItem.GetType().Name).Success) if (nameRegex.Match(name).Success && typeRegex.Match(contentItem.GetType().Name).Success)
{ {
string finalName = contentItem.GetType().Name.Replace("Item", ""); string finalName = contentItem.GetType().Name.Replace("Item", "");
if (contentItem is ScriptItem)
matches.Add(new SearchResult { Name = contentItem.ShortName, Type = finalName, Item = contentItem }); name = contentItem.FileName; // Show extension for scripts (esp. for .h and .cpp files of the same name)
matches.Add(new SearchResult { Name = name, Type = finalName, Item = contentItem });
} }
} }
} }