* Enable scrollbars when paper size is bigger than available space. (Bug ID #32482)

git-svn-id: trunk@57397 -
This commit is contained in:
michael 2018-02-27 16:56:39 +00:00
parent fa64cfae8b
commit 3d6ae4ccb4
2 changed files with 14 additions and 2 deletions

View File

@ -80,6 +80,7 @@ Type
procedure DoneMoveSelection; procedure DoneMoveSelection;
procedure DoneResizeSelection; procedure DoneResizeSelection;
procedure DoneSelectRectangle(Extend: Boolean); procedure DoneSelectRectangle(Extend: Boolean);
procedure DoPagesizeChange(Sender: TObject);
procedure DoReportChanged(Sender: TObject); procedure DoReportChanged(Sender: TObject);
procedure ExtendAddRectangle; procedure ExtendAddRectangle;
procedure ExtendSelectRectangle; procedure ExtendSelectRectangle;
@ -319,6 +320,7 @@ procedure TFPReportDesignerControl.SetPage(AValue: TFPReportCustomPage);
begin begin
If AValue=FPage then exit; If AValue=FPage then exit;
FPage:=AValue; FPage:=AValue;
FPage.OnPageSizeChange:=@DoPagesizeChange;
UpdatePageParams; UpdatePageParams;
FObjects.LoadFromPage(AValue); FObjects.LoadFromPage(AValue);
FObjects.OrderBands(Canvas,CurrentDPI); FObjects.OrderBands(Canvas,CurrentDPI);
@ -1019,6 +1021,12 @@ begin
SetDesignerState(dsNeutral); SetDesignerState(dsNeutral);
end; end;
procedure TFPReportDesignerControl.DoPagesizeChange(Sender: TObject);
begin
UpdatePageParams;
Invalidate;
end;
procedure TFPReportDesignerControl.DoReportChanged(Sender: TObject); procedure TFPReportDesignerControl.DoReportChanged(Sender: TObject);
begin begin
Invalidate; Invalidate;

View File

@ -598,17 +598,21 @@ function TFPReportDesignerForm.AddPageDesign(aPageNo: Integer;
Var Var
TS : TPageTabSheet; TS : TPageTabSheet;
SB : TScrollBox;
D : TFPReportDesignerControl; D : TFPReportDesignerControl;
begin begin
TS:=TPageTabSheet.Create(Self); TS:=TPageTabSheet.Create(Self);
TS.FPage:=APage; TS.FPage:=APage;
TS.Parent:=PCReport; TS.Parent:=PCReport;
// TS.AutoScroll:=True;
TS.Caption:=Format('Page %d',[aPageNo]); TS.Caption:=Format('Page %d',[aPageNo]);
D:=TFPReportDesignerControl.Create(Self); D:=TFPReportDesignerControl.Create(Self);
SB:=TScrollBox.Create(TS);
SB.Parent:=TS;
SB.Align:=alClient;
TS.FDesigner:=D; TS.FDesigner:=D;
D.Parent:=TS; D.Parent:=SB;
// FDesign.Align:=alClient; // FDesign.Align:=alClient;
// fdesign.SetBounds(0,0,ClientWidth,ClientHeight); // fdesign.SetBounds(0,0,ClientWidth,ClientHeight);
D.Top:=0; D.Top:=0;