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

lcl: if there is no bitmap handles are created for Icon then add it to imagelist using rawimage (issue #0017900)

Browse Source 
git-svn-id: trunk@28956 -
This commit is contained in:
paul 2011-01-11 09:15:01 +00:00
parent 1b32e2fefb
commit 013f06f128
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/graphics.pp
View File

@ -1569,6 +1569,7 @@ type
property Handle: HBITMAP read FHandle;
property MaskHandle: HBITMAP read FMaskHandle;
property Palette: HPALETTE read GetPalette;
property RawImage: TRawImage read FImage;
end;

3
lcl/imglist.pp
View File

@ -128,7 +128,8 @@ type
function GetReference: TWSCustomImageListReference;
procedure InternalInsert(AIndex: Integer; AImage, AMask: HBitmap;
AWidth, AHeight: Integer);
AWidth, AHeight: Integer); overload;
procedure InternalInsert(AIndex: Integer; ARawImage: TRawImage); overload;
procedure InternalMove(ACurIndex, ANewIndex: Cardinal; AIgnoreCurrent: Boolean);
procedure InternalReplace(AIndex: Integer; AImage, AMask: HBitmap);
function InternalSetImage(AIndex: Integer; AImage: TRawImage): PRGBAQuad;

42
lcl/include/imglist.inc
View File

@ -233,6 +233,43 @@ begin
Change;
end;
procedure TCustomImageList.InternalInsert(AIndex: Integer; ARawImage: TRawImage);
var
RawImg: TRawImage;
R: TRect;
ImgData: PRGBAQuad;
i, ACount: Integer;
begin
CheckIndex(AIndex, True);
if (AIndex < 0) then
AIndex := 0;
ACount := ARawImage.Description.Width div Width;
if ACount = 0 then
ACount := 1;
Inc(FCount, ACount);
AllocData(FCount);
if AIndex < FCount - ACount then
begin
for i := 0 to ACount - 1 do
InternalMove(FCount - i - 1, AIndex + i, True);
end;
R := Rect(0, 0, FWidth, FHeight);
for i := 0 to ACount - 1 do
begin
ARawImage.ExtractRect(R, RawImg);
ImgData := InternalSetImage(AIndex + i, RawImg);
if HandleAllocated
then TWSCustomImageListClass(WidgetSetClass).Insert(Self, AIndex + i, ImgData);
inc(R.Left, FWidth);
inc(R.Right, FWidth);
end;
FChanged := true;
Change;
end;
{------------------------------------------------------------------------------
Method: TCustomImageList.Assign
Params: Source: Source data
@ -704,7 +741,10 @@ begin
IconIndex := AIcon.GetBestIndexForSize(Size(Width, Height));
if IconIndex = -1 then Exit;
Image := TSharedIcon(TCustomIconAccess(AIcon).FSharedImage).Images[IconIndex];
InternalInsert(AIndex, Image.Handle, Image.MaskHandle, Image.Width, Image.Height);
if Image.Handle = 0 then
InternalInsert(AIndex, Image.RawImage)
else
InternalInsert(AIndex, Image.Handle, Image.MaskHandle, Image.Width, Image.Height);
end;
{------------------------------------------------------------------------------