re-fix treeview object sorting

LeftofZen · LeftofZen · commit a3638f297abc · 2024-08-14T11:47:15.000+10:00
diff --git a/AvaGui/ViewModels/FolderTreeViewModel.cs b/AvaGui/ViewModels/FolderTreeViewModel.cs
@@ -98,7 +98,9 @@ async Task<List<FileSystemItemBase>> LoadObjDirectoryCoreAsync(string directory,
 							.GroupBy(o => o.Value.VehicleType)
 							.OrderBy(vg => vg.Key.ToString()))
 						{
-							var vehicleSubNodes = new ObservableCollection<FileSystemItemBase>(vg.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame)));
+							var vehicleSubNodes = new ObservableCollection<FileSystemItemBase>(vg
+								.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame))
+								.OrderBy(o => o.Name));
 
 							if (vg.Key == null)
 							{
@@ -115,8 +117,9 @@ async Task<List<FileSystemItemBase>> LoadObjDirectoryCoreAsync(string directory,
 					}
 					else
 					{
-						subNodes = new ObservableCollection<FileSystemItemBase>(
-							objGroup.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame)));
+						subNodes = new ObservableCollection<FileSystemItemBase>(objGroup
+							.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame))
+							.OrderBy(o => o.Name));
 					}
 
 					result.Add(new FileSystemItemGroup(

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,9 @@ async Task<List<FileSystemItemBase>> LoadObjDirectoryCoreAsync(string directory,`
`98`	`98`	`.GroupBy(o => o.Value.VehicleType)`
`99`	`99`	`.OrderBy(vg => vg.Key.ToString()))`
`100`	`100`	`{`
`101`		`- var vehicleSubNodes = new ObservableCollection<FileSystemItemBase>(vg.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame)));`
	`101`	`+ var vehicleSubNodes = new ObservableCollection<FileSystemItemBase>(vg`
	`102`	`+ .Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame))`
	`103`	`+ .OrderBy(o => o.Name));`
`102`	`104`
`103`	`105`	`if (vg.Key == null)`
`104`	`106`	`{`
`@@ -115,8 +117,9 @@ async Task<List<FileSystemItemBase>> LoadObjDirectoryCoreAsync(string directory,`
`115`	`117`	`}`
`116`	`118`	`else`
`117`	`119`	`{`
`118`		`- subNodes = new ObservableCollection<FileSystemItemBase>(`
`119`		`- objGroup.Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame)));`
	`120`	`+ subNodes = new ObservableCollection<FileSystemItemBase>(objGroup`
	`121`	`+ .Select(o => new FileSystemItem(o.Key, o.Value.Name.Trim(), o.Value.SourceGame))`
	`122`	`+ .OrderBy(o => o.Name));`
`120`	`123`	`}`
`121`	`124`
`122`	`125`	`result.Add(new FileSystemItemGroup(`