amethyst/NBTExplorer
1
0
Fork 0
forked from mirrors/NBTExplorer
Code Pull requests Activity

Make directories sort before files in sort order.

Browse source 
Change identifiers to match existing style.
This commit is contained in:
David Vierra 2015-02-25 23:32:57 -10:00
parent d8229f7ec5
commit 5c32832281
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
NBTExplorer/Controllers/NodeTreeController.cs
View file

@ -23,7 +23,7 @@ namespace NBTExplorer.Controllers
public class NodeTreeComparer : IComparer public class NodeTreeComparer : IComparer
{ {
public int orderForTag(TagType tagID) public int OrderForTag(TagType tagID)
{ {
switch (tagID) switch (tagID)
{ {
@ -44,6 +44,18 @@ namespace NBTExplorer.Controllers
} }
} }
public int OrderForNode(object node)
{
if (node is DirectoryDataNode)
{
return 0;
}
else
{
return 1;
}
}
public int Compare(object x, object y) public int Compare(object x, object y)
{ {
TreeNode tx = x as TreeNode; TreeNode tx = x as TreeNode;
@ -53,12 +65,20 @@ namespace NBTExplorer.Controllers
if (dx == null || dy == null) if (dx == null || dy == null)
{ {
return tx.Text.CompareTo(ty.Text); int nodeOrder = this.OrderForNode(tx.Tag).CompareTo(this.OrderForNode(ty.Tag));
if (nodeOrder != 0)
{
return nodeOrder;
}
else
{
return tx.Text.CompareTo(ty.Text);
}
} }
TagType idx = dx.Tag.GetTagType(); TagType idx = dx.Tag.GetTagType();
TagType idy = dy.Tag.GetTagType(); TagType idy = dy.Tag.GetTagType();
int tagOrder = this.orderForTag(idx).CompareTo(this.orderForTag(idy)); int tagOrder = this.OrderForTag(idx).CompareTo(this.OrderForTag(idy));
if (tagOrder != 0) if (tagOrder != 0)
{ {
return tagOrder; return tagOrder;