paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 05:39:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: change TFileListBox behavior to be more delphi compatible (issue #0010985 by Bart Broersma with modifications)

Browse Source 
git-svn-id: trunk@14828 -
This commit is contained in:
paul 2008-04-15 13:00:09 +00:00
parent fdde79363f
commit 4f20c0b8a7
1 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lcl/filectrl.pp
View File

@ -140,42 +140,50 @@ implementation
{ TCustomFileListBox }
procedure TCustomFileListBox.UpdateFileList;
Var
var
Info: TSearchRec;
Added: Boolean;
procedure AddFile(FileAttr: TFileAttr; SysAttr: integer);
function FileTypeToFileAttribute(FileType: TFileType): LongInt;
const
FileTypeToAttrMap: array[TFileAttr] of LongInt =
(
{ ftReadOnly } faReadOnly,
{ ftHidden } faHidden,
{ ftSystem } faSysFile,
{ ftVolumeID } faVolumeId,
{ ftDirectory } faDirectory,
{ ftArchive } faArchive,
{ ftNormal } 0
);
var
Iter: TFileAttr;
begin
if (not Added) and (FileAttr in FileType)
and ((Info.Attr and SysAttr)>0) then begin
if (Info.Attr and faDirectory)>0 then
Info.Name := '['+Info.Name+']';
Items.Add(Info.Name);
Added:=true;
end;
Result := 0;
for Iter := Low(TFileAttr) to High(TFileAttr) do
if Iter in FileType then
Result := Result or FileTypeToAttrMap[Iter];
end;
begin
if [csloading,csdestroying]*ComponentState<>[] then exit;
if [csloading, csdestroying] * ComponentState <> [] then
Exit;
Clear;
If SysUtils.FindFirst(FDirectory+DirectorySeparator+AllDirectoryEntriesMask,
faAnyFile, Info)=0
then
Repeat
if MatchesMaskList(Info.Name,Mask) then begin
Added:=false;
AddFile(ftReadOnly,faReadOnly);
AddFile(ftHidden,faHidden);
AddFile(ftSystem,faSysFile);
AddFile(ftVolumeID,faVolumeId);
AddFile(ftDirectory,faDirectory);
AddFile(ftArchive,faArchive);
if not Added and (ftNormal in FileType) and
(faAnyFile and Info.Attr=0) then
Items.Add(Info.Name);
end;
Until SysUtils.FindNext(Info) <> 0;
SysUtils.FindClose(Info);
if FileType <> [] then
begin
if SysUtils.FindFirst(IncludeTrailingPathDelimiter(FDirectory)+AllDirectoryEntriesMask,
FileTypeToFileAttribute(FileType), Info) = 0
then
repeat
if MatchesMaskList(Info.Name,Mask) then
begin
if (Info.Attr and faDirectory) > 0 then
Items.Add('['+Info.Name+']')
else
Items.Add(Info.Name);
end;
until SysUtils.FindNext(Info) <> 0;
SysUtils.FindClose(Info);
end;
UpdateSelectedFileName;
end;