Skip to content

Use epsilon-aware greater than in TextLine and TextFormatter #20650

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
MrJul merged 2 commits into from
Feb 10, 2026
Merged

Use epsilon-aware greater than in TextLine and TextFormatter #20650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38d7ba3
Use epsilon-aware greater than in TextLine and TextFormatter
kerams Feb 9, 2026
2dedf63
Merge branch 'master' into text
MrJul Feb 10, 2026
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
4 changes: 2 additions & 2 deletions src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ReSharper disable ForCanBeConvertedToForeach
// ReSharper disable ForCanBeConvertedToForeach
using System;
using System.Buffers;
using System.Collections.Generic;
Expand Down Expand Up @@ -662,7 +662,7 @@ private static int MeasureLength(IReadOnlyList<TextRun> textRuns, double paragra
clusterLength = shapedTextCharacters.GlyphRun.Metrics.FirstCluster + currentRun.Length - currentInfo.GlyphCluster;
}

if (currentWidth + clusterWidth > paragraphWidth)
if (MathUtilities.GreaterThan(currentWidth + clusterWidth, paragraphWidth))
{
if (runLength == 0 && measuredLength == 0)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Avalonia.Media.TextFormatting.Unicode;
Expand Down Expand Up @@ -1423,7 +1423,7 @@ private TextLineMetrics CreateLineMetrics()
var overhangLeading = inkBounds.Left;
//The width of overhanging pixels at the end of the natural bounds. Positive value means we are inside.
var overhangTrailing = widthIncludingWhitespace - inkBounds.Right;
var hasOverflowed = width > _paragraphWidth;
var hasOverflowed = MathUtilities.GreaterThan(width, _paragraphWidth);

var start = GetParagraphOffsetX(width, widthIncludingWhitespace);

Expand Down