diff options
| author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2012-08-28 13:38:01 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2012-08-28 13:38:01 +0100 |
| commit | 5e00828842c03d16e74f324a34fff5cf2757311c (patch) | |
| tree | 0fed2e9e630bb481b020552160f00adfa80359e4 /src | |
| parent | 55e69bc624c6548cae1ae241fe75d3403f8d998e (diff) | |
| download | fpGUI-5e00828842c03d16e74f324a34fff5cf2757311c.tar.xz | |
pdf: The "preview page" widget (TfpgBevel) is now only created once.
* This fixes the problem where the preview pages appears above other widgets in
the preview window.
Diffstat (limited to 'src')
| -rw-r--r-- | src/reportengine/u_report.pas | 5 | ||||
| -rw-r--r-- | src/reportengine/u_visu.pas | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/reportengine/u_report.pas b/src/reportengine/u_report.pas index 94561f5f..48de55b9 100644 --- a/src/reportengine/u_report.pas +++ b/src/reportengine/u_report.pas @@ -746,9 +746,8 @@ begin F_Visu := TF_Visu.Create(nil, self); with F_Visu do begin - Bv_Visu := CreateBevel(F_Visu, (F_Visu.Width - FPaper.W) div 2, ((F_Visu.Height + 50 - FPaper.H) div 2), - FPaper.W, FPaper.H, bsBox, bsRaised); - Bv_Visu.BackgroundColor := clWhite; + Bv_Visu.SetPosition((F_Visu.Width - FPaper.W - F_Visu.PreviewMargin) div 2, + ((F_Visu.Height + 50 + F_Visu.PreviewMargin - FPaper.H) div 2), FPaper.W, FPaper.H); Bv_Visu.OnPaint := @Bv_VisuPaint; end; end; diff --git a/src/reportengine/u_visu.pas b/src/reportengine/u_visu.pas index 87b6f1b9..5322f56f 100644 --- a/src/reportengine/u_visu.pas +++ b/src/reportengine/u_visu.pas @@ -72,6 +72,7 @@ type L_NumPageSect: TfpgLabel; L_FromPageSect: TfpgLabel; L_NbrPageSect: TfpgLabel; + Bv_PreviewPage: TfpgBevel; FPreviewMargin: integer; procedure FormShow(Sender: TObject); procedure Bt_CloseClick(Sender: TObject); @@ -486,6 +487,9 @@ begin CreateReportImages; + Bv_PreviewPage := CreateBevel(self, 0, 0, 50, 50, bsBox, bsRaised); + Bv_PreviewPage.BackgroundColor := clWhite; + Bv_Command := CreateBevel(Self, 0, 0, Width, 50, bsBox, bsRaised); Bt_Close := CreateButton(Bv_Command, 10, 10, 26, '', @Bt_CloseClick, 'stdimg.exit'); Bt_Print := CreateButton(Bv_Command, 50, 10, 26, '', @Bt_PrintClick, 'stdimg.print'); @@ -519,6 +523,8 @@ begin L_NumPageSect := CreateLabel(Bv_Sections, 365, E_NumSect.Top, '-', 30, E_NumSect.Height, taLeftJustify, tlcenter); L_FromPageSect := CreateLabel(Bv_Sections, 410, E_NumSect.Top, 'of', 30, E_NumSect.Height, taLeftJustify, tlcenter); L_NbrPageSect := CreateLabel(Bv_Sections, 440, E_NumSect.Top, '-', 30, E_NumSect.Height, taLeftJustify, tlcenter); + + Bv_Visu := Bv_PreviewPage; // assign to global reference variable end; destructor TF_Visu.Destroy; |