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

fixed TImage background for transparent images

Browse Source 
git-svn-id: trunk@5185 -
This commit is contained in:
mattias 2004-02-10 00:21:04 +00:00
parent c1592f9af8
commit 44a86a6469
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/graphics.pp
View File

@ -1029,10 +1029,10 @@ type
property HandleType: TBitmapHandleType read GetHandleType write SetHandleType;
property MaskHandle: HBITMAP read GetMaskHandle write SetMaskHandle;
property Monochrome: Boolean read FMonochrome write FMonochrome;
property PixelFormat: TPixelFormat read FPixelFormat write SetPixelFormat;
property ScanLine[Row: Integer]: Pointer read GetScanLine;
property PixelFormat: TPixelFormat read FPixelFormat write SetPixelFormat default pfDevice;
property ScanLine[Row: Integer]: Pointer read GetScanLine; // only for Delphi compatibility
property TransparentColor: TColor read FTransparentColor
write FTransparentColor;
write FTransparentColor default clNone;
property TransparentMode: TTransparentMode read FTransparentMode
write SetTransparentMode default tmAuto;
end;
@ -1442,6 +1442,9 @@ end.
{ =============================================================================
$Log$
Revision 1.113 2004/02/10 00:21:04 mattias
fixed TImage background for transparent images
Revision 1.112 2004/02/07 20:25:37 mattias
fixed saving custom TBitBtn kind

29
lcl/include/customimage.inc
View File

@ -49,16 +49,21 @@ procedure TCustomImage.DoAutoSize;
var
ModifyWidth,
ModifyHeight : Boolean;
NewWidth: Integer;
NewHeight: Integer;
begin
If AutoSize and not AutoSizing then begin
AutoSizing := True;
ModifyWidth := (Align = alleft) or (Align = alRight) or (Align = alNone);
ModifyHeight := (Align = alTop) or (Align = alBottom) or (Align = alNone);
ModifyWidth := Align in [alLeft,alRight,alNone];
ModifyHeight := Align in [alTop,alBottom,alNone];
If ModifyWidth and (Picture.Width > 0) then
Width := Max(Picture.Width, CONSTRAINTS.MinWidth);
NewWidth := Max(Picture.Width, Constraints.MinWidth);
If ModifyHeight and (Picture.Height > 0) then
Height := Max(Picture.Height, CONSTRAINTS.MinHeight);
PictureChanged(Self);
NewHeight := Max(Picture.Height, Constraints.MinHeight);
if (NewWidth<>Width) or (NewHeight<>Height) then begin
SetBounds(Left,Top,NewWidth,NewHeight);
PictureChanged(Self);
end;
AutoSizing := False;
end;
end;
@ -157,6 +162,7 @@ Procedure TCustomImage.Paint;
var
RGN : longint;
iRect : TRect;
BackgroundColor: Integer;
begin
With Canvas do begin
RGN := CreateRectRGN(0, 0, Width + 1, Height + 1);
@ -166,15 +172,18 @@ begin
If Picture.Graphic = nil then
exit;
iRect:=DestRect;
If Picture.Graphic.Transparent and not Transparent then begin
If Picture.Graphic.Transparent and (not Transparent) then begin
If Picture.Graphic is TBitmap then
Brush.Color := TBitmap(Picture.Graphic).TransparentColor
BackgroundColor := TBitmap(Picture.Graphic).TransparentColor
else
Brush.Color := clWhite;
BackgroundColor := clWhite;
end else begin
BackgroundColor:=clNone;
end;
if (BackgroundColor<>clNone) then begin
Brush.Color:=BackgroundColor;
FillRect(iRect);
end;
Brush.Color:=clBlue;
FillRect(iRect);
StretchDraw(iRect, Picture.Graphic);
end;