mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: Patch [2786832] "Some bugfixes in sorting" from Andrey V

Browse source
This commit is contained in:
Alexander Koblov 2009-05-05 05:44:45 +00:00
commit 5cc04bfa9f
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/ufilelist.pas
View file

@ -457,7 +457,11 @@ begin
if gCaseSensitiveSort then
Result := StrComp(PChar(PFileRecItem(item1)^.sName), PChar(PFileRecItem(item2)^.sName))
else
Result := StrIComp(PChar(PFileRecItem(item1)^.sName), PChar(PFileRecItem(item2)^.sName));
{$IFDEF MSWINDOWS}
Result := AnsiCompareText(UTF8ToAnsi(PFileRecItem(item1)^.sName), UTF8ToAnsi(PFileRecItem(item2)^.sName));
{$ELSE}
Result := AnsiCompareText(PFileRecItem(item1)^.sName, PFileRecItem(item2)^.sName);
{$ENDIF}
if bSortNegative then
Result := -Result;
@ -474,7 +478,15 @@ begin
if PFileRecItem(item1)^.sExt = PFileRecItem(item2)^.sExt then
Exit;
Result := StrComp(PChar(PFileRecItem(item1)^.sExt), PChar(PFileRecItem(item2)^.sExt));
if gCaseSensitiveSort then
Result := StrComp(PChar(PFileRecItem(item1)^.sExt), PChar(PFileRecItem(item2)^.sExt))
else
{$IFDEF MSWINDOWS}
Result := AnsiCompareText(UTF8ToAnsi(PFileRecItem(item1)^.sExt), UTF8ToAnsi(PFileRecItem(item2)^.sExt));
{$ELSE}
Result := AnsiCompareText(PFileRecItem(item1)^.sExt, PFileRecItem(item2)^.sExt);
{$ENDIF}
{
if PFileRecItem(item1)^.sExt > PFileRecItem(item2)^.sExt then
Result:=-1
@ -650,6 +662,12 @@ var
i : Integer;
pSortingColumn : PFileListSortingColumn;
begin
if (Count = 0) and (iField = SF_BYNAME) then
begin
Result := 1;
Exit;
end;
Result := -1;
i := Count - 1;