Fix preceding char getting cut off during word wrap and add option to disable word wrapping #1274
Conversation
This file contains hidden or 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
Yanrishatum
reviewed
Mar 22, 2025
h2d/Text.hx
Outdated
| @@ -371,10 +382,11 @@ class Text extends Drawable { | |||
| } | |||
| else wLastSep = size; | |||
| } | |||
| else if( (x + esize + letterSpacing) - wLastSep > maxWidth ) { | |||
| else if( (x + esize + letterSpacing) - wLastSep > (maxWidth-esize) && wordWrap ) { | |||
There was a problem hiding this comment.
Probably should reverse the order of checks, and put wordWrap first, as first check becomes redundant when it's off.
Comment on lines
+388
to
+389
| restPos = i; | ||
| x -= esize + letterSpacing; |
There was a problem hiding this comment.
Iirc it was i+1 because word wrap was triggering on spaces, and during wrap we want to skip the space character. There should be a charset.isSpace check to determine if character should be skipped or not.
There was a problem hiding this comment.
I'm not sure i follow entirely as this is still handled in the previous condition, which means that no spaces will be included in the lines array during a linebreak as stated here:
if( lineBreak && (size > maxWidth || (!breakFound && size + afterData > maxWidth)) ) {
newline = true;
if( font.charset.isSpace(cc) ){
lines.push(text.substr(restPos, i - restPos));
e = null;
}else{
lines.push(text.substr(restPos, i + 1 - restPos));
}
restPos = i + 1;
}
What i modified is part of the else block where the character is not a space nor any other break character.
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.
This will solve the issue where a word gets broken into a new line and the previous char on the new line gets skipped. There is also now the option to disable mid word splitting.