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: Capability to load icons only from internal theme

Browse source 
(cherry picked from commit 1deb745de2)
This commit is contained in:
Alexander Koblov 2026-04-18 20:15:23 +03:00
commit 77d8e348a6
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/platform/upixmapmanager.pas
View file

@ -76,6 +76,11 @@ type
Bitmap: array[TDriveType] of TBitmap;
end;
TIconThemeType = (
ittInternal, // DCTheme only
ittSystemOrInternal // System theme, DCTheme
);
{ TfromWhatBitmapWasLoaded }
//Used to indicate from where the icon was loaded from.
//Useful when exporting to TC for example which cannot used "as is" the same icon file in some circumstances.
@ -351,7 +356,8 @@ type
function CheckAddFileUniqueIcon(AFullPath: String; AIconSize : Integer = 0): PtrInt;
{$ENDIF}
function GetIconByName(const AIconName: String): PtrInt;
function GetThemeIcon(const AIconName: String; AIconSize: Integer) : Graphics.TBitmap;
function GetThemeIcon(const AIconName: String; AIconSize: Integer) : Graphics.TBitmap; overload;
function GetThemeIcon(AThemeType: TIconThemeType; const AIconName: String; AIconSize: Integer) : Graphics.TBitmap; overload;
function GetDriveIcon(Drive : PDrive; IconSize : Integer; clBackColor : TColor; LoadIcon: Boolean = True) : Graphics.TBitmap;
function GetDefaultDriveIcon(IconSize : Integer; clBackColor : TColor) : Graphics.TBitmap;
function GetArchiveIcon(IconSize: Integer; clBackColor : TColor) : Graphics.TBitmap;
@ -2760,10 +2766,25 @@ begin
end;
function TPixMapManager.GetThemeIcon(const AIconName: String; AIconSize: Integer): Graphics.TBitmap;
begin
Result:= GetThemeIcon(ittSystemOrInternal, AIconName, AIconSize);
end;
function TPixMapManager.GetThemeIcon(AThemeType: TIconThemeType; const AIconName: String; AIconSize: Integer): Graphics.TBitmap;
var
ABitmap: Graphics.TBitmap;
begin
Result:= LoadIconThemeBitmap(AIconName, AIconSize);
if AThemeType > ittInternal then
Result:= LoadIconThemeBitmap(AIconName, AIconSize)
else begin
FPixmapsLock.Acquire;
try
Result:= LoadThemeIcon(FDCIconTheme, AIconName, AIconSize);
finally
FPixmapsLock.Release;
end;
end;
if Assigned(Result) then
begin
// LoadIconThemeBitmap takes into account