Fix #10150: Force FS_SMALL for small viewport signs. #10283
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
This is a workaround for string widths being different with mixed font-sizes.
(This method of drawing shadows is hilarious and needs replacing, but this is a quick fix.)
2TallTyler
reviewed
Dec 25, 2022
| @@ -1323,7 +1323,7 @@ void ViewportAddString(const DrawPixelInfo *dpi, ZoomLevel small_from, const Vie | |||
| int shadow_offset = 0; | |||
| if (string_small_shadow != STR_NULL) { | |||
| shadow_offset = 4; | |||
| AddStringToDraw(sign->center - sign_half_width + shadow_offset, sign->top, string_small_shadow, params_1, params_2, INVALID_COLOUR, sign->width_small); | |||
| AddStringToDraw(sign->center - sign_half_width + shadow_offset, sign->top, string_small_shadow, params_1, params_2, INVALID_COLOUR, sign->width_small | 0x8000); | |||
There was a problem hiding this comment.
Is there not a flag enum for this?
There was a problem hiding this comment.
No, it is only used here, and only tested with HasBit(ss.width, 15). I have in mind a proper rewrite so don't really want to start adding flags.
2TallTyler
approved these changes
Dec 25, 2022
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.
Motivation / Problem
As per #10150, small town sign labels may be cropped with Truetype fonts.
This is a workaround for string widths being different with mixed font-sizes.
For some reason (with Uniscribe at least), the string bounding box of "{FS_SMALL}Text" can be different when called starting with FS_SMALL and FS_NORMAL.
Description
This is resolved by explicitly drawing small signs with FS_SMALL, although the underlying problem is not touched.
Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.