|
@@ -1,6 +1,7 @@
|
|
|
unit Fresnel.TextLayouter;
|
|
|
|
|
|
{$mode objfpc}
|
|
|
+{$H+}
|
|
|
{$modeswitch advancedrecords}
|
|
|
|
|
|
interface
|
|
@@ -104,7 +105,7 @@ Type
|
|
|
Property FPColor : TFPColor Read FColor write SetFPColor;
|
|
|
Published
|
|
|
// In name
|
|
|
- Property Name : string Read FName Write SetName;
|
|
|
+ Property Name : TFontNameString Read FName Write SetName;
|
|
|
// In pixels
|
|
|
Property Size : Smallint Read FSize write SetSize;
|
|
|
// attributes
|
|
@@ -1214,7 +1215,7 @@ var
|
|
|
aPos : sizeInt;
|
|
|
SplitPos : TTextSplitPoint;
|
|
|
B,BN : TTextBlock;
|
|
|
- T : String;
|
|
|
+
|
|
|
|
|
|
begin
|
|
|
I:=0;
|
|
@@ -1222,17 +1223,14 @@ begin
|
|
|
begin
|
|
|
B:=FBlocks[i];
|
|
|
Repeat
|
|
|
- T:=B.Text;
|
|
|
SplitPos:=Splitter.GetNextNewLine(Text,1+B.TextOffset);
|
|
|
if SplitPos.Offset<>-1 then
|
|
|
begin
|
|
|
aPos:=Splitpos.offset+Splitpos.whitespace;
|
|
|
BN:=B.Split(aPos);
|
|
|
- T:=BN.Text;
|
|
|
BN.ForceNewLine:=True;
|
|
|
B.TextLen:=B.TextLen-SplitPos.WhiteSpace;
|
|
|
B.TrimTrailingWhiteSpace;
|
|
|
- T:=B.Text;
|
|
|
inc(I);
|
|
|
FBlocks.Insert(I,BN);
|
|
|
B:=BN;
|