Fix calculation of wrapping advance #440
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Copilot reviewed 3 out of 17 changed files in this pull request and generated no comments.
Files not reviewed (14)
- tests/Images/ReferenceOutput/CountLinesWrappingLength_100-3.png: Language not supported
- tests/Images/ReferenceOutput/CountLinesWrappingLength_100-4.png: Language not supported
- tests/Images/ReferenceOutput/CountLinesWrappingLength_50-4.png: Language not supported
- tests/Images/ReferenceOutput/CountLinesWrappingLength_50-5.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordBreakMatchesMDN_238-layoutMode_HorizontalBottomTop-wordBreaking_BreakAll.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordBreakMatchesMDN_238-layoutMode_HorizontalTopBottom-wordBreaking_BreakAll.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordBreak_500-layoutMode_HorizontalBottomTop-wordBreaking_BreakAll.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordBreak_500-layoutMode_HorizontalTopBottom-wordBreaking_BreakAll.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordWrappingHorizontalBottomTop_350-height_62.625-width_318.86.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordWrappingHorizontalTopBottom_350-height_62.625-width_318.86.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordWrappingVerticalLeftRight_350-height_318.563-width_62.813.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordWrappingVerticalMixedLeftRight_350-height_318.563-width_62.813.png: Language not supported
- tests/Images/ReferenceOutput/MeasureTextWordWrappingVerticalRightLeft_350-height_318.563-width_62.813.png: Language not supported
- tests/Images/ReferenceOutput/ShouldNotInsertExtraLineBreaks_2__WrappingLength_400_.png: Language not supported
Comments suppressed due to low confidence (4)
tests/SixLabors.Fonts.Tests/Issues/Issues_431.cs:35
- Ensure that the new test case
ShouldNotInsertExtraLineBreaks_2covers the new behavior correctly, especially with the changes in theBreakLinesmethod.
public void ShouldNotInsertExtraLineBreaks_2()
src/SixLabors.Fonts/TextLayout.cs:1077
- The comment about using inches for comparison is misleading since the actual comparison is done in pixels after conversion. Consider rephrasing to clarify the intent.
// Now scale the advance. We use inches for comparison.
src/SixLabors.Fonts/TextLayout.cs:1156
- Re-initializing
lineAdvancehere might be unnecessary and could lead to confusion. Ensure thatlineAdvanceis correctly managed within the loop.
float lineAdvance = 0;
src/SixLabors.Fonts/TextLayout.cs:1175
- Resetting
ito-1might cause an off-by-one error. Verify if this is the intended behavior or ifishould be reset to0.
i = -1;
| if (codePointIndex == currentLineBreak.PositionWrap && currentLineBreak.Required) | ||
| { | ||
| // Mandatory line break at index. | ||
| TextLine remaining = textLine.SplitAt(i); | ||
| textLines.Add(textLine.Finalize(options)); | ||
| textLine = remaining; | ||
| i = 0; | ||
| i = -1; |
There was a problem hiding this comment.
This took me a few hours to figure out! Setting i = 0 was incorrect as the loop was incrementing the value before we read the collection again.
tocsoft
reviewed
Jan 10, 2025
tocsoft
approved these changes
Jan 10, 2025
|
👍 With 2.0.9 all my tests now seem to render as expected. |
|
Apparently I spoke too soon. 😞 Came across another regression by accident. Filed as #441. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prerequisites
Description
An index mismatch was causing the incorrect line-break to be used under certain circumstance.
CC @jez9999