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

Merged revision(s) 56872 #84369842cc, 58149 #e3404ff564 from trunk:

Browse Source 
LCL: Supporting TCanvas.Draw a TBitmap in pf8bit TBitmap.PixelFormat. Issue #32878. Patch by fantangshan
........
LCL: Fix compilation of TControlBar.OnBandPaint event handler in objfpc mode. (https://forum.lazarus.freepascal.org/index.php/topic,41504.msg288037)
........

git-svn-id: branches/fixes_1_8@58722 -
This commit is contained in:
maxim 2018-08-16 22:19:10 +00:00
parent edff405905
commit 8f11d3465c
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/extctrls.pp
View File

@ -1380,7 +1380,7 @@ type
TBandInfoEvent = procedure (Sender: TObject; Control: TControl;
var Insets: TRect; var PreferredSize, RowCount: Integer) of object;
TBandMoveEvent = procedure (Sender: TObject; Control: TControl; var ARect: TRect) of object;
TBandPaintEvent = procedure (Sender: TObject; Control: TControl; Canvas: TCanvas;
TBandPaintEvent = procedure (Sender: TObject; Control: TControl; ACanvas: TCanvas;
var ARect: TRect; var Options: TBandPaintOptions) of object;
TRowSize = 1..MaxInt;

2
lcl/include/custombitmap.inc
View File

@ -221,7 +221,7 @@ begin
case FPixelFormat of
pf1bit: Flags := [riqfMono, riqfMask];
pf4bit,
pf8bit: Flags := [riqfRGB, riqfMask, riqfPalette];
pf8bit: Flags := [riqfGrey, riqfMask, riqfPalette];
pf32bit: Flags := [riqfRGB, riqfMask, riqfAlpha];
else
Flags := [riqfRGB, riqfMask];

15
lcl/interfaces/gtk2/gtk2lclintf.inc
View File

@ -561,18 +561,6 @@ function TGtk2WidgetSet.RawImage_QueryDescription(AFlags: TRawImageQueryFlags; v
var
Desc: TRawImageDescription;
begin
if riqfGrey in AFlags then
begin
DebugLn('TGtk2WidgetSet.RawImage_QueryDescription: riqfGrey not (yet) supported');
Exit(False);
end;
if riqfPalette in AFlags then
begin
DebugLn('TGtk2WidgetSet.RawImage_QueryDescription: riqfPalette not (yet) supported');
Exit(False);
end;
Desc.Init;
Result := RawImage_DescriptionFromDrawable(Desc, nil, riqfAlpha in AFlags);
if not Result then Exit;
@ -601,8 +589,6 @@ begin
ADesc.BluePrec := 1;
ADesc.BlueShift := Desc.MaskShift;
end
(*
//TODO
else if riqfGrey in AFlags
then begin
ADesc.Format := ricfGray;
@ -615,7 +601,6 @@ begin
ADesc.RedPrec := 8;
ADesc.RedShift := 0;
end
*)
else
if riqfRGB in AFlags then
begin