Skip to content

Fix text bugs in SynPDF #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iadcode wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix text bugs in SynPDF #422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be2ce84
Fix text bounding rectangle check
iadcode Dec 9, 2021
4a38e31
Fix text underline/strikethrough bug
iadcode Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SynPdf.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10350,7 +10350,7 @@ procedure DrawLine(var P: TPoint; aH: Single);
with DC[nDC] do begin
tmp := Pen;
pen.color := font.color;
pen.width := aSize / 15 / Canvas.GetWorldFactorX / Canvas.FDevScaleX;
pen.width := aSize / 15 / fscaleY;
pen.style := PS_SOLID;
pen.null := False;
NeedPen;
Expand Down Expand Up @@ -10421,7 +10421,7 @@ procedure DrawLine(var P: TPoint; aH: Single);
if AUseDX then begin
DX := pointer(PtrUInt(@R)+R.emrtext.offDx);
W := DXTextWidth(DX, R.emrText.nChars);
if W<R.rclBounds.Right-R.rclBounds.Left then // offDX=0 or within box
if W < Trunc((R.rclBounds.Right-R.rclBounds.Left) / Canvas.FFactorX) then // offDX=0 or within box
DX := nil;
end else
DX := nil;
Expand Down Expand Up @@ -10607,9 +10607,9 @@ procedure DrawLine(var P: TPoint; aH: Single);
end;
// handle underline or strike out styles (direct draw PDF lines on canvas)
if font.LogFont.lfUnderline<>0 then
DrawLine(Posi, aSize / 8 / Canvas.GetWorldFactorX / Canvas.FDevScaleX);
DrawLine(Posi, aSize / 8 / fscaleY);
if font.LogFont.lfStrikeOut<>0 then
DrawLine(Posi, - aSize / 3 / Canvas.GetWorldFactorX / Canvas.FDevScaleX);
DrawLine(Posi, - aSize / 4 / fscaleY);
// end any pending clipped TextRect() region
if WithClip then begin
Canvas.GRestore;
Expand Down