Fix: Allow changing size of default OpenTTD font. #12641
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
Size configuration for default font was ignored as a different code path to load the font was followed. Resolved by removing this additional path and conditionally selecting the default font.
ladysadie
reviewed
May 8, 2024
| { | ||
| const FontCacheSubSetting *settings = GetFontCacheSubSetting(fs); | ||
| if (!settings->font.empty()) return settings->font; | ||
| if (_fcsettings.prefer_sprite) return {}; |
There was a problem hiding this comment.
Shouldn't the prefer sprite flag override any font name having been set? Wouldn't have a font name set here break the prefer sprites checkbox?
There was a problem hiding this comment.
prefer sprite only affects default font, if you set a font name the checkbox should be disabled.
There was a problem hiding this comment.
That is how it works today. I didn't know that.
I am not sure about disabling the checkbox though. That seems to be unrelated to this review though.
rubidium42
approved these changes
May 22, 2024
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
Size configuration for default font was ignored as a different code path to load the font was followed.
Size of default font could only be changed after manually setting the configured font to the default font name.
Description
Resolved by removing this additional path and conditionally selecting the default font.
This allows the normal font size selection to occur, and reduces some special-casing for the default font.
Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.