diff options
| author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2010-09-30 16:23:12 +0200 |
|---|---|---|
| committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2010-09-30 16:23:12 +0200 |
| commit | ca40ae0d912ea60e8da09cef4a3daf5b01b1c37a (patch) | |
| tree | c735f0ea78ecc68a371ab5c67d6283ece2a695e3 /docview/components/richtext | |
| parent | afd430ce6b734e13487d348b6e04b3ec4055b6cb (diff) | |
| download | fpGUI-ca40ae0d912ea60e8da09cef4a3daf5b01b1c37a.tar.xz | |
Removed FontWidthPrecisionFactor. We don't use it anyway.
Diffstat (limited to 'docview/components/richtext')
| -rw-r--r-- | docview/components/richtext/RichTextLayoutUnit.pas | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/docview/components/richtext/RichTextLayoutUnit.pas b/docview/components/richtext/RichTextLayoutUnit.pas index bbf60643..822e8c42 100644 --- a/docview/components/richtext/RichTextLayoutUnit.pas +++ b/docview/components/richtext/RichTextLayoutUnit.pas @@ -601,12 +601,12 @@ var begin case Style.Alignment of taLeft: - Result := Style.LeftMargin * FontWidthPrecisionFactor; + Result := Style.LeftMargin; taRight: - Result := Style.LeftMargin * FontWidthPrecisionFactor + Result := Style.LeftMargin + FLayoutWidth - - Style.RightMargin * FontWidthPrecisionFactor + - Style.RightMargin - Line.Width; taCenter: @@ -617,10 +617,9 @@ begin // |<-----line width------> | // space = layoutw-rm-linew SpaceOnLine := FLayoutWidth - - Style.RightMargin * FontWidthPrecisionFactor + - Style.RightMargin - Line.Width; // Note: line width includes left margin - Result := Style.LeftMargin * FontWidthPrecisionFactor - + SpaceOnLine div 2; + Result := Style.LeftMargin + (SpaceOnLine div 2); end; end; end; @@ -671,8 +670,7 @@ begin // so work out alignment X := GetStartX( Style, Line ); - if X div FontWidthPrecisionFactor - > XToFind then + if X > XToFind then begin // found before the start of the line // don't set link @@ -687,8 +685,7 @@ begin // Now find out how wide the thing is inc( X, GetElementWidth( Element ) ); - if X div FontWidthPrecisionFactor - > XToFind then + if X > XToFind then begin // found Offset := PCharDiff( P, Line.Text ); @@ -715,7 +712,7 @@ begin PerformStyleTag( Element.Tag, Style, X ); - NewMarginX := Style.LeftMargin * FontWidthPrecisionFactor; + NewMarginX := Style.LeftMargin; if NewMarginX > X then begin //skip across... @@ -771,7 +768,7 @@ begin if GetCharIndex( P ) - GetCharIndex( Line.Text ) >= Offset then begin - X := X div FontWidthPrecisionFactor; + X := X; // found exit; end; @@ -793,7 +790,7 @@ begin Style, X ); - NewMarginX := Style.LeftMargin * FontWidthPrecisionFactor; + NewMarginX := Style.LeftMargin; if NewMarginX > X then begin //skip across... @@ -808,7 +805,7 @@ begin if not StartedDrawing then X := GetStartX( Style, Line ); - X := X div FontWidthPrecisionFactor; + X := X; end; function TRichTextLayout.GetLineFromPosition( YToFind: longint; @@ -930,9 +927,7 @@ begin if IsValidBitmapIndex( BitmapIndex ) then begin Bitmap := FImages.Item[BitmapIndex].Image; - Result := Trunc(Bitmap.Width - * FontWidthPrecisionFactor - * FHorizontalImageScale); + Result := Trunc(Bitmap.Width * FHorizontalImageScale); end; end; |