Resolve #21494: Automatically set window scaling based on DPI #21907
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
Check DPI at UiContext load if not previously checked, then set to reasonable division of 0.25.
Gymnasiast
reviewed
Apr 27, 2024
| if (!SDL_GetDisplayDPI(0, &ddpi, &hdpi, &vdpi)) | ||
| { | ||
| // If DPI can be read, divide DPI by regular DPI (96.0f) and round to nearest 0.25 | ||
| gConfigGeneral.WindowScale = std::round(ddpi / 96.0f * 4.0) / 4.0; |
There was a problem hiding this comment.
Suggested change
| gConfigGeneral.WindowScale = std::round(ddpi / 96.0f * 4.0) / 4.0; | |
| constexpr auto regularDPI = 96.0f; | |
| gConfigGeneral.WindowScale = std::round((ddpi / regularDPI) * 4.0) / 4.0; |
That also makes the comment redundant. (The general rule is to try and make the code speak, if that is not feasible, a comment is fine)
Gymnasiast
reviewed
Apr 27, 2024
| if (gConfigGeneral.RefreshDPIScaling) | ||
| { | ||
| float ddpi, hdpi, vdpi; | ||
| if (!SDL_GetDisplayDPI(0, &ddpi, &hdpi, &vdpi)) |
There was a problem hiding this comment.
Suggested change
| if (!SDL_GetDisplayDPI(0, &ddpi, &hdpi, &vdpi)) | |
| if (SDL_GetDisplayDPI(0, &ddpi, &hdpi, &vdpi) == 0) |
! implies a bool.
There was a problem hiding this comment.
It returns an error code, 0 in this case means success.
There was a problem hiding this comment.
I know. What I was saying is that an explicit check for that code makes it clearer it is a code and not a bool.
There was a problem hiding this comment.
For some reason I thought the suggestion is the actual diff, my bad.
|
@karstenvanf Could you apply the requested changes? |
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.
I used a similar to solution to #6991, but modified it to include a config option that flags whether the DPI has been checked instead of setting an invalid scaling factor. If the DPI check returns an error, it does not change from the default of 1.