Aren/haiku
1
0
Fork 0
Code Issues Pull Requests 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-11 12:24:52 +02:00
parent e96cbb12b4
commit 3773b47514
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kits/tracker/Model.cpp
View File

@ -320,16 +320,14 @@ Model::CompareFolderNamesFirst(const Model *compareModel) const
const Model *resolvedCompareModel = compareModel->ResolveIfLink();
const Model *resolvedMe = ResolveIfLink();
if (resolvedMe->IsVolume()) {
if (!resolvedCompareModel->IsVolume())
return -1;
} else if (resolvedCompareModel->IsVolume())
return 1;
bool meIsDirOrVolume = resolvedMe->IsDirectory() || resolvedMe->IsVolume();
bool otherIsDirOrVolume = resolvedCompareModel->IsDirectory()
|| resolvedCompareModel->IsVolume();
if (resolvedMe->IsDirectory()) {
if (!resolvedCompareModel->IsDirectory())
if (meIsDirOrVolume) {
if (!otherIsDirOrVolume)
return -1;
} else if (resolvedCompareModel->IsDirectory())
} else if (otherIsDirOrVolume)
return 1;
return NaturalCompare(Name(), compareModel->Name());