UPD: Always display overlay icons for symbolic links, like other file managers (issue #2854)

(cherry picked from commit b51733f25e)
This commit is contained in:
Alexander Koblov 2026-05-30 12:51:32 +03:00
commit 0bdafe982c
5 changed files with 22 additions and 29 deletions

View file

@ -462,16 +462,12 @@ var
);
// Draw overlay icon for a file if needed
if gIconOverlays then
begin
PixMapManager.DrawBitmapOverlay(AFile,
FileSourceDirectAccess,
Canvas,
params.iconRect.Left,
params.iconRect.Top
);
end;
PixMapManager.DrawBitmapOverlay(AFile,
FileSourceDirectAccess,
Canvas,
params.iconRect.Left,
params.iconRect.Top
);
end;
// Print filename with align
targetWidth:= (DefaultColWidth - 2 - Canvas.TextWidth('I'));

View file

@ -1572,15 +1572,12 @@ var
);
// Draw overlay icon for a file if needed
if gIconOverlays then
begin
PixMapManager.DrawBitmapOverlay(AFile,
FileSourceDirectAccess,
Canvas,
params.iconRect.Left,
params.iconRect.Top
);
end;
PixMapManager.DrawBitmapOverlay(AFile,
FileSourceDirectAccess,
Canvas,
params.iconRect.Left,
params.iconRect.Top
);
end;

View file

@ -546,15 +546,12 @@ var
end;
// Draw overlay icon for a file if needed
if gIconOverlays then
begin
PixMapManager.DrawBitmapOverlay(AFile,
FileSourceDirectAccess,
Canvas,
aRect.Left + 2,
iTextTop - gIconsSize - 2
);
end;
PixMapManager.DrawBitmapOverlay(AFile,
FileSourceDirectAccess,
Canvas,
aRect.Left + 2,
iTextTop - gIconsSize - 2
);
s:= AFile.DisplayStrings[0];
s:= FitFileName(s, Canvas, AFile.FSFile, aRect.Width - 4);

View file

@ -152,6 +152,9 @@ begin
// Qt bindings support only 16px icons for menu items
{$IF DEFINED(LCLQT5) OR DEFINED(LCLQT6)}
cbIconsInMenusSize.Visible:= False;
{$ENDIF}
{$IF DEFINED(DARWIN) OR DEFINED(HAIKU)}
cbIconsShowOverlay.Visible:= False;
{$ENDIF}
for I:= Low(ICON_SIZES) to High(ICON_SIZES) do
begin

View file

@ -2248,7 +2248,7 @@ begin
end;
end
{$IF DEFINED(MSWINDOWS) OR DEFINED(RabbitVCS)}
else
else if gIconOverlays then
if DirectAccess then
begin
if AFile.IconOverlayID >= SystemIconIndexStart then