paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-04 06:02:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r43492 from trunk:

Browse Source 
------------------------------------------------------------------------
    r43492 | michael | 2019-11-16 14:26:06 +0100 (Sat, 16 Nov 2019) | 1 line
    
    * Add ellipsis, fix string type when wrapping
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43722 -
This commit is contained in:
michael 2019-12-23 13:24:50 +00:00
parent dbb053a67e
commit 417f8e072a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,8 @@ type
TFPReportWordOverflow = (woTruncate, // truncate the word
woOverflow, // Allow to overflow
woSplit, // Split word at max char count that fits length.
woAsterisk // Replace word with * chars.
woAsterisk, // Replace word with * chars.
woEllipsis // Truncate word, add ... ellipsis.
);
TFPReportSections = set of rsPage..rsColumn;
@ -250,6 +251,7 @@ const
cMMperInch = 25.4;
cCMperInch = 2.54;
cMMperCM = 10;
cEllipsis : UnicodeChar = #$2026; // '…';
DefaultBandNames : Array[TFPReportBandType] of string
= ('Unknown','Page Header','Report Title','Column Header', 'Data Header','Group Header','Data','Group Footer',
'Data Footer','Column Footer','Report Summary','PageFooter','Child');
@ -1965,8 +1967,8 @@ type
procedure SetFont(const AValue: TFPReportFont);
procedure CullTextOutOfBounds;
protected
procedure AddTextLine(lFC: TFPFontCacheItem; var S: String; MaxW: TFPReportUnits);
procedure WrapText(const AText: String; lFC: TFPFontCacheItem; const ALineWidth: TFPReportUnits; out AHeight: TFPReportUnits); virtual;
procedure AddTextLine(lFC: TFPFontCacheItem; var S: UTF8String; MaxW: TFPReportUnits);
procedure WrapText(const AText: UTF8String; lFC: TFPFontCacheItem; const ALineWidth: TFPReportUnits; out AHeight: TFPReportUnits); virtual;
procedure ReassignParentFont;
procedure ParentFontChanged; override;
function CreateTextAlignment: TFPReportTextAlignment; virtual;
@ -3942,12 +3944,13 @@ end;
line must also be processed before continuing. If All = False, then double
CR can be ignored. }
procedure TFPReportCustomMemo.AddTextLine(lFC: TFPFontCacheItem; Var S : String; MaxW : TFPReportUnits);
procedure TFPReportCustomMemo.AddTextLine(lFC: TFPFontCacheItem; Var S : UTF8String; MaxW : TFPReportUnits);
var
w: single;
m: integer;
s2, s3: string;
s2, s3: UTF8String;
begin
s2 := s;
w := lFC.TextWidth(s2, Font.Size);
@ -3988,6 +3991,14 @@ begin
m:=Length(S); // Discard the remainder of the word.
woSplit:
m:=Length(S3); // S3 was the longest possible part of the word. Split after
woEllipsis:
begin
repeat
S2:=Copy(S2,1,Length(S2)-1);
Until (Length(S2)<1) or (lFC.TextWidth(s2+UTF8Encode(cEllipsis), Font.Size)<MaxW);
S2:=S2+UTF8Encode(cEllipsis);
m:=Length(S); // Discard the remainder of the word.
end;
woAsterisk:
begin
w:= lFC.TextWidth('*', Font.Size);
@ -4013,12 +4024,12 @@ begin
end; { if/else }
end;
procedure TFPReportCustomMemo.WrapText(const AText: String; lFC: TFPFontCacheItem; const ALineWidth: TFPReportUnits; out AHeight: TFPReportUnits);
procedure TFPReportCustomMemo.WrapText(const AText: UTF8String; lFC: TFPFontCacheItem; const ALineWidth: TFPReportUnits; out AHeight: TFPReportUnits);
var
maxw: single; // value in pixels
n: integer;
s: string;
s: UTF8String;
c: char;
lWidth: single;
@ -4913,7 +4924,7 @@ procedure TFPReportCustomMemo.RecalcLayout;
var
h, maxW: TFPReportUnits;
lFC : TFPFontCacheItem;
S : String;
S : UTF8String;
begin
FTextBlockList.Clear;