paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-27 03:29:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Added additional stretchmodes. Correct stretchmode for Memo element

Browse Source 
git-svn-id: trunk@38593 -
This commit is contained in:
michael 2018-03-22 09:06:53 +00:00
parent ff28ce84b2
commit 317583d6d2
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/fcl-report/src/fpreport.pp
View File

@ -111,7 +111,7 @@ type
TFPReportFrameLines = set of TFPReportFrameLine;
TFPReportFrameShape = (fsNone, fsRectangle, fsRoundedRect, fsDoubleRect, fsShadow);
TFPReportFieldKind = (rfkString, rfkBoolean, rfkInteger, rfkFloat, rfkDateTime, rfkStream, rfkCurrency);
TFPReportStretchMode = (smDontStretch, smActualHeight, smMaxHeight);
TFPReportStretchMode = (smDontStretch, smActualHeight, smActualHeightStretchOnly, smActualHeightShrinkOnly, smMaxHeight);
TFPReportHTMLTag = (htRegular, htBold, htItalic);
TFPReportHTMLTagSet = set of TFPReportHTMLTag;
TFPReportColumnLayout = (clVertical, clHorizontal);
@ -3743,12 +3743,39 @@ end;
procedure TFPReportCustomMemo.ApplyStretchMode(const AHeight: TFPReportUnits);
var
j: TFPReportUnits;
begin
if Assigned(RTLayout) then
procedure CalcNeededHeight;
begin
j :=((AHeight + LineSpacing) * TextLines.Count) + TextAlignment.TopMargin + TextAlignment.BottomMargin;
if j > RTLayout.Height then { only grow height if needed. We don't shrink. }
end;
begin
if Not Assigned(RTLayout) then
Exit;
Case StretchMode of
smMaxHeight:
begin
if Assigned(Parent) and Assigned(RTLayout) then
RTLayout.Height:=Parent.RTLayout.Height-RTLayout.Top;
end;
smActualHeight:
begin
CalcNeededHeight;
RTLayout.Height := j;
end;
smActualHeightStretchOnly:
begin
CalcNeededHeight;
if j>RTLayout.Height then { only grow height if needed. We don't shrink. }
RTLayout.Height := j;
end;
smActualHeightShrinkOnly:
begin
CalcNeededHeight;
if j<RTLayout.Height then { only shrink height if needed. We don't grow. }
RTLayout.Height := j;
end;
end;
end;