pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

GridPrinter: Fix custom painting of cell broken by previous commit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8633 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-11-26 18:54:48 +00:00
parent 8bb47927c9
commit debd0c4b9c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/gridprinter/source/gridprn.pas
View File

@ -220,7 +220,8 @@ type
procedure DoLinePrinted(ARow, ALastCol: Integer); virtual; procedure DoLinePrinted(ARow, ALastCol: Integer); virtual;
procedure DoNewPage(AStartCol, AStartRow, AEndCol, AEndRow: Integer); virtual; procedure DoNewPage(AStartCol, AStartRow, AEndCol, AEndRow: Integer); virtual;
procedure DoPrepareCanvas(ACol, ARow: Integer); virtual; procedure DoPrepareCanvas(ACol, ARow: Integer); virtual;
procedure DoPrintCell(ACanvas: TCanvas; ACol, ARow: Integer; ARect: TRect); virtual; procedure DoPrintCell(ACanvas: TCanvas; ACol, ARow: Integer; ARect: TRect;
var Done: boolean); virtual;
procedure DoUpdatePreview; virtual; procedure DoUpdatePreview; virtual;
procedure Execute(ACanvas: TCanvas); procedure Execute(ACanvas: TCanvas);
function GetBrushColor(AColor: TColor): TColor; function GetBrushColor(AColor: TColor): TColor;
@ -752,13 +753,14 @@ begin
end; end;
procedure TGridPrinter.DoPrintCell(ACanvas: TCanvas; ACol, ARow: Integer; procedure TGridPrinter.DoPrintCell(ACanvas: TCanvas; ACol, ARow: Integer;
ARect: TRect); ARect: TRect; var Done: Boolean);
begin begin
if Assigned(FOnPrintCell) then if Assigned(FOnPrintCell) then
begin begin
FOnPrintCell(Self, FGrid, ACanvas, ACol, ARow, ARect); FOnPrintCell(Self, FGrid, ACanvas, ACol, ARow, ARect);
exit; Done := true;
end; end else
Done := false;
end; end;
procedure TGridPrinter.DoUpdatePreview; procedure TGridPrinter.DoUpdatePreview;
@ -1295,8 +1297,11 @@ var
col: TGridColumn; col: TGridColumn;
lGrid: TGridAccess; lGrid: TGridAccess;
checkedState: TCheckboxState; checkedState: TCheckboxState;
done: Boolean;
begin begin
DoPrintCell(ACanvas, ACol, ARow, ARect); DoPrintCell(ACanvas, ACol, ARow, ARect, done);
if done then
exit;
lGrid := TGridAccess(FGrid); lGrid := TGridAccess(FGrid);