Skip to content

Fixed text segment formatter text size calculation #213

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

Merged
merged 2 commits into from
Mar 30, 2022
Merged

Fixed text segment formatter text size calculation #213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ebd117
Fixed text size calculation for segments containing only line breaks
tinokrueger Mar 16, 2022
c5d7df2
Fixed enumeration access
tinokrueger Mar 16, 2022
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
16 changes: 11 additions & 5 deletions PdfSharpCore/Drawing.Layout/XTextSegmentFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ public void DrawString(IEnumerable<TextSegment> textSegments, XRect layoutRectan
textSegments,
layoutRectangle,
format,
(block, dx, dy) => _gfx.DrawString(block.Text, block.Environment.Font, block.Environment.Brush, dx + block.Location.X, dy + block.Location.Y)
(block, dx, dy) => _gfx.DrawString(block.Text, block.Environment.Font, block.Environment.Brush, dx + block.Location.X, dy + block.Location.Y),
false
);
}

Expand Down Expand Up @@ -144,9 +145,11 @@ public XSize CalculateTextSize(IEnumerable<TextSegment> textSegments, double wid
var layoutRectangle = new XRect(0, 0, width, 100000000);
var blocks = new List<Block>();

ProcessTextSegments(textSegments, layoutRectangle, format, (block, dx, dy) => blocks.Add(block));
ProcessTextSegments(textSegments, layoutRectangle, format, (block, dx, dy) => blocks.Add(block), true);

var height = blocks.Max(b => b.Location.Y);
var height = blocks.Any()
? blocks.Max(b => b.Location.Y)
: 0;
var maxLineHeight = 0.0;
for (int i = blocks.Count - 1; i >= 0; i--)
{
Expand All @@ -170,7 +173,7 @@ public XSize CalculateTextSize(IEnumerable<TextSegment> textSegments, double wid
return new XSize(calculatedWith, height + maxLineHeight);
}

private void ProcessTextSegments(IEnumerable<TextSegment> textSegments, XRect layoutRectangle, XStringFormat format, Action<Block, double, double> applyBlock)
private void ProcessTextSegments(IEnumerable<TextSegment> textSegments, XRect layoutRectangle, XStringFormat format, Action<Block, double, double> applyBlock, bool applyBlockIfLineBreak)
{
if (textSegments.All(ts => string.IsNullOrEmpty(ts.Text)))
{
Expand Down Expand Up @@ -242,7 +245,7 @@ private void ProcessTextSegments(IEnumerable<TextSegment> textSegments, XRect la
break;
}

if (block.Type == BlockType.LineBreak)
if (block.Type == BlockType.LineBreak && !applyBlockIfLineBreak)
{
continue;
}
Expand Down Expand Up @@ -397,6 +400,9 @@ private void CreateLayout(List<List<Block>> blockUnits, XRect layoutRectangle)

break;
}

// necessary to correctly calculate closing line breaks
block.Location = new XPoint(0, y);
}
else
{
Expand Down