mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: Don't use class helper

Browse source
This commit is contained in:
Alexander Koblov 2019-12-28 10:12:10 +00:00
commit 3a38e21049
2 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/dmcommondata.pas
View file

@ -49,24 +49,24 @@ begin
ilEditorImages.Width:= AdjustIconSize(ilEditorImages.Width, 96);
ilEditorImages.Height:= AdjustIconSize(ilEditorImages.Height, 96);
{$endif}
ilEditorImages.LoadThemeIcon(0, 'document-new');
ilEditorImages.LoadThemeIcon(1, 'document-open');
ilEditorImages.LoadThemeIcon(2, 'document-save');
ilEditorImages.LoadThemeIcon(3, 'document-save-as');
ilEditorImages.LoadThemeIcon(4, 'document-properties');
ilEditorImages.LoadThemeIcon(5, 'edit-cut');
ilEditorImages.LoadThemeIcon(6, 'edit-copy');
ilEditorImages.LoadThemeIcon(7, 'edit-paste');
ilEditorImages.LoadThemeIcon(8, 'edit-undo');
ilEditorImages.LoadThemeIcon(9, 'edit-redo');
ilEditorImages.LoadThemeIcon(10, 'edit-find');
ilEditorImages.LoadThemeIcon(11, 'edit-find-replace');
ilEditorImages.LoadThemeIcon(12, 'application-exit');
ilEditorImages.LoadThemeIcon(13, 'help-about');
ilEditorImages.LoadThemeIcon(14, 'edit-delete');
ilEditorImages.LoadThemeIcon(15, 'edit-select-all');
ilEditorImages.LoadThemeIcon(16, 'go-jump');
ilEditorImages.LoadThemeIcon(17, 'view-refresh');
LoadThemeIcon(ilEditorImages, 0, 'document-new');
LoadThemeIcon(ilEditorImages, 1, 'document-open');
LoadThemeIcon(ilEditorImages, 2, 'document-save');
LoadThemeIcon(ilEditorImages, 3, 'document-save-as');
LoadThemeIcon(ilEditorImages, 4, 'document-properties');
LoadThemeIcon(ilEditorImages, 5, 'edit-cut');
LoadThemeIcon(ilEditorImages, 6, 'edit-copy');
LoadThemeIcon(ilEditorImages, 7, 'edit-paste');
LoadThemeIcon(ilEditorImages, 8, 'edit-undo');
LoadThemeIcon(ilEditorImages, 9, 'edit-redo');
LoadThemeIcon(ilEditorImages, 10, 'edit-find');
LoadThemeIcon(ilEditorImages, 11, 'edit-find-replace');
LoadThemeIcon(ilEditorImages, 12, 'application-exit');
LoadThemeIcon(ilEditorImages, 13, 'help-about');
LoadThemeIcon(ilEditorImages, 14, 'edit-delete');
LoadThemeIcon(ilEditorImages, 15, 'edit-select-all');
LoadThemeIcon(ilEditorImages, 16, 'go-jump');
LoadThemeIcon(ilEditorImages, 17, 'view-refresh');
end;
end.

22
src/ugraphics.pas
View file

@ -29,19 +29,11 @@ interface
uses
Classes, SysUtils, Graphics, Controls, IntfGraphics;
type
{ TImageListHelper }
TImageListHelper = class helper for TImageList
public
procedure LoadThemeIcon(Index: Integer; const AIconName: String);
end;
procedure BitmapAssign(Bitmap: TBitmap; Image: TRasterImage);
procedure BitmapAssign(Bitmap: TBitmap; Image: TLazIntfImage);
procedure BitmapAlpha(var ABitmap: TBitmap; APercent: Single);
procedure BitmapCenter(var Bitmap: TBitmap; Width, Height: Integer);
procedure LoadThemeIcon(ImageList: TImageList; Index: Integer; const AIconName: String);
implementation
@ -148,18 +140,16 @@ begin
end;
end;
{ TImageListHelper }
procedure TImageListHelper.LoadThemeIcon(Index: Integer; const AIconName: String);
procedure LoadThemeIcon(ImageList: TImageList; Index: Integer; const AIconName: String);
var
ABitmap: TBitmap;
begin
ABitmap:= PixMapManager.GetThemeIcon(AIconName, Self.Width);
ABitmap:= PixMapManager.GetThemeIcon(AIconName, ImageList.Width);
if (ABitmap = nil) then ABitmap:= TBitmap.Create;
if (Index < Count) then
Self.Replace(Index, ABitmap , nil)
if (Index < ImageList.Count) then
ImageList.Replace(Index, ABitmap , nil)
else begin
Self.Insert(Index, ABitmap , nil)
ImageList.Insert(Index, ABitmap , nil)
end;
ABitmap.Free;
end;