i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracker: Sort volumes like folders

Browse Source 
Volumes no longer have a higher sorting priority than folders when "sort
folders first" is enabled.
This commit is contained in:
Ingo Weinhold
2011-07-17 16:55:13 +02:00
parent e96cbb12b4
commit 3773b47514
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/Model.cpp
+6 -8
View File
@@ -320,16 +320,14 @@ Model::CompareFolderNamesFirst(const Model *compareModel) const
const Model *resolvedCompareModel = compareModel->ResolveIfLink(); const Model *resolvedCompareModel = compareModel->ResolveIfLink();
const Model *resolvedMe = ResolveIfLink(); const Model *resolvedMe = ResolveIfLink();
if (resolvedMe->IsVolume()) { bool meIsDirOrVolume = resolvedMe->IsDirectory() || resolvedMe->IsVolume();
if (!resolvedCompareModel->IsVolume()) bool otherIsDirOrVolume = resolvedCompareModel->IsDirectory()
return -1; || resolvedCompareModel->IsVolume();
} else if (resolvedCompareModel->IsVolume())
return 1;
if (resolvedMe->IsDirectory()) { if (meIsDirOrVolume) {
if (!resolvedCompareModel->IsDirectory()) if (!otherIsDirOrVolume)
return -1; return -1;
} else if (resolvedCompareModel->IsDirectory()) } else if (otherIsDirOrVolume)
return 1; return 1;
return NaturalCompare(Name(), compareModel->Name()); return NaturalCompare(Name(), compareModel->Name());