Repository navigation
[rtextures] ImageTextEx(): use MeasureTextEx() line spacing, fix multiline scaling - #6311
Merged
Merged
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
|
||
| // Scale image depending on text size | ||
| if (textSize.y != imSize.y) | ||
| if (fontSize != (float)font.baseSize) |
Owner
|
@drgropp thanks for the review, looks ok |
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
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.
Fixes #6308
ImageTextEx()sized the image withMeasureTextEx()but drew lines a fixedbaseSize + baseSize/2apart, so multiline text was clipped (or padded with large spacing), ignoredSetTextLineSpacing(), and was scaled bytextSize.y/imSize.y(1.88 instead of 2.0 in the issue repro).Changes, all inside
ImageTextEx():MeasureTextEx()result already computed in the function (textLineSpacingis private to rtext.c), and step lines by the equivalent amount at base size.fontSize/baseSize, using the image's real dimensions.Tested with the repro from #6308 (default font, size 20) on Windows:
SetTextLineSpacing(0)DrawText()SetTextLineSpacing(12)DrawText()If you'd prefer exposing the line spacing (e.g. a
GetTextLineSpacing()) instead of deriving it, I'm happy to rework it that way.