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

LCL: Improve handling of PageNumber in various Printer classes. Issue #37682, patch from Joeny Ang.

Browse Source 
git-svn-id: trunk@64104 -
This commit is contained in:
juha 2020-11-04 17:48:46 +00:00
parent 039687aae1
commit 16ffa2572f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/cairocanvas/cairocanvas.pas
View File

@ -362,6 +362,7 @@ end;
procedure TCairoPrinterCanvas.NewPage; procedure TCairoPrinterCanvas.NewPage;
begin begin
inherited NewPage;
EndPage; EndPage;
BeginPage; BeginPage;
end; end;

8
lcl/printers.pas
View File

@ -376,7 +376,7 @@ begin
Include(fFlags, pfPrinting); Include(fFlags, pfPrinting);
Exclude(fFlags, pfAborted); Exclude(fFlags, pfAborted);
fPageNumber := 0; fPageNumber := 1;
if not RawMode then begin if not RawMode then begin
Canvas.Refresh; Canvas.Refresh;
@ -414,6 +414,7 @@ end;
//Create an new page //Create an new page
procedure TPrinter.NewPage; procedure TPrinter.NewPage;
begin begin
Inc(fPageNumber);
if TMethod(@Self.DoNewPage).Code = Pointer(@TPrinter.DoNewPage) then if TMethod(@Self.DoNewPage).Code = Pointer(@TPrinter.DoNewPage) then
begin begin
// DoNewPage has not been overriden, use the new method // DoNewPage has not been overriden, use the new method
@ -423,7 +424,6 @@ begin
begin begin
// Use the old method as DoNewPage has been overriden in descendat TPrinter // Use the old method as DoNewPage has been overriden in descendat TPrinter
CheckPrinting(True); CheckPrinting(True);
Inc(fPageNumber);
if not RawMode then if not RawMode then
TPrinterCanvas(Canvas).NewPage; TPrinterCanvas(Canvas).NewPage;
DoNewPage; DoNewPage;
@ -433,7 +433,6 @@ end;
procedure TPrinter.BeginPage; procedure TPrinter.BeginPage;
begin begin
CheckPrinting(True); CheckPrinting(True);
inc(fPageNumber);
if not RawMode then if not RawMode then
TPrinterCanvas(Canvas).BeginPage; TPrinterCanvas(Canvas).BeginPage;
DoBeginPage; DoBeginPage;
@ -1397,12 +1396,13 @@ end;
procedure TPrinterCanvas.NewPage; procedure TPrinterCanvas.NewPage;
begin begin
Inc(fPageNum);
BeginPage; BeginPage;
end; end;
procedure TPrinterCanvas.BeginPage; procedure TPrinterCanvas.BeginPage;
begin begin
Inc(fPageNum);
end; end;
procedure TPrinterCanvas.EndPage; procedure TPrinterCanvas.EndPage;