paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 21:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: TCustomImageList.InsertMasked - add mask to the image description if source does not have it before masking

Browse Source 
git-svn-id: trunk@36697 -
This commit is contained in:
paul 2012-04-10 03:12:26 +00:00
parent cf85a988a4
commit 8814a4f697
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/include/imglist.inc
View File

@ -814,6 +814,7 @@ procedure TCustomImageList.InsertMasked(Index: Integer; AImage: TCustomBitmap;
var var
RawImg: TRawImage; RawImg: TRawImage;
SourceImage, MaskedImage: TLazIntfImage; SourceImage, MaskedImage: TLazIntfImage;
MaskedDescription, DeviceDescription: TRawImageDescription;
begin begin
if AImage = nil then Exit; if AImage = nil then Exit;
SourceImage := TLazIntfImage.Create(AImage.RawImage, False); SourceImage := TLazIntfImage.Create(AImage.RawImage, False);
@ -821,6 +822,16 @@ begin
MaskedImage := TLazIntfImage.Create(0,0,[]); MaskedImage := TLazIntfImage.Create(0,0,[]);
try try
MaskedImage.DataDescription := SourceImage.DataDescription; MaskedImage.DataDescription := SourceImage.DataDescription;
if MaskedImage.DataDescription.MaskBitsPerPixel = 0 then
begin
MaskedDescription := MaskedImage.DataDescription;
DeviceDescription := GetDescriptionFromDevice(0, 0, 0);
MaskedDescription.MaskBitsPerPixel := DeviceDescription.MaskBitsPerPixel;
MaskedDescription.MaskBitOrder := DeviceDescription.MaskBitOrder;
MaskedDescription.MaskLineEnd := DeviceDescription.MaskLineEnd;
MaskedDescription.MaskShift := DeviceDescription.MaskShift;
MaskedImage.DataDescription := MaskedDescription;
end;
MaskedImage.CopyPixels(SourceImage); MaskedImage.CopyPixels(SourceImage);
MaskedImage.Mask(TColorToFPColor(ColorToRGB(MaskColor))); MaskedImage.Mask(TColorToFPColor(ColorToRGB(MaskColor)));
MaskedImage.GetRawImage(RawImg); MaskedImage.GetRawImage(RawImg);