Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-06 05:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show directores before files in asset browser

Browse Source
This commit is contained in:
Simon Lübeß
2025-06-29 22:09:34 +02:00
parent 173942114f
commit e9644018ff
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/src/EditWindows/ContentBrowserWindow.bf
+19 -6
View File
@@ -431,7 +431,7 @@ namespace GlitchyEditor.EditWindows
/// Renders the contents of _currentDirectory. Returns the node of the current directory, or null if the browser isn't in a directory. /// Renders the contents of _currentDirectory. Returns the node of the current directory, or null if the browser isn't in a directory.
private void DrawCurrentDirectory(TreeNode<AssetNode> currentDirectoryNode) private void DrawCurrentDirectory(TreeNode<AssetNode> currentDirectoryNode)
{ {
List<TreeNode<AssetNode>> files = null; List<TreeNode<AssetNode>> directoryEntries = null;
ImGui.Style* style = ImGui.GetStyle(); ImGui.Style* style = ImGui.GetStyle();
@@ -441,12 +441,12 @@ namespace GlitchyEditor.EditWindows
if (_searchEverywhere && searchFilter.Length > 0) if (_searchEverywhere && searchFilter.Length > 0)
{ {
files = scope:: List<TreeNode<AssetNode>>(); directoryEntries = scope:: List<TreeNode<AssetNode>>();
_manager.AssetHierarchy.[Friend]_assetRootNode.ForEach(scope (node) => _manager.AssetHierarchy.[Friend]_assetRootNode.ForEach(scope (node) =>
{ {
if (node->Name.Contains(searchFilter, true)) if (node->Name.Contains(searchFilter, true))
{ {
files.Add(node); directoryEntries.Add(node);
} }
}); });
} }
@@ -458,7 +458,7 @@ namespace GlitchyEditor.EditWindows
return; return;
} }
files = currentDirectoryNode.Children; directoryEntries = currentDirectoryNode.Children;
// show back button (".."-File) // show back button (".."-File)
if (currentDirectoryNode.Parent != _manager.AssetHierarchy.RootNode) if (currentDirectoryNode.Parent != _manager.AssetHierarchy.RootNode)
@@ -480,7 +480,20 @@ namespace GlitchyEditor.EditWindows
} }
} }
for (var entry in files) directoryEntries.Sort((entry1, entry2) => {
// Try to sort so that directories are before files.
int score = entry2->IsDirectory <=> entry1->IsDirectory;
if (score == 0)
{
// If both are either directories or files sort alphabetically.
score = StringView.Compare(entry1->Name, entry2->Name, true);
}
return score;
});
for (var entry in directoryEntries)
{ {
if (!entry->Name.Contains(searchFilter, true)) if (!entry->Name.Contains(searchFilter, true))
continue; continue;
@@ -495,7 +508,7 @@ namespace GlitchyEditor.EditWindows
float expectedButtonRight = currentButtonRight + style.ItemSpacing.x + DirectoryItemSize.X; float expectedButtonRight = currentButtonRight + style.ItemSpacing.x + DirectoryItemSize.X;
// If we aren't the last entry and the next button won't fit on the same line we start a new line. // If we aren't the last entry and the next button won't fit on the same line we start a new line.
if ((entry != files.Back || _showNewFile) && expectedButtonRight < window_visible_x2) if ((entry != directoryEntries.Back || _showNewFile) && expectedButtonRight < window_visible_x2)
ImGui.SameLine(); ImGui.SameLine();
ImGui.PopID(); ImGui.PopID();