Fix viewport attach position when forced integer stretch scale of 1 makes it bigger than window #91787
+8
−5
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
…akes it bigger than window
kleonc
commented
May 10, 2024
Comment on lines
-1142
to
-1151
| Size2 offset; | ||
|
|
||
| if (screen_size.x < video_mode.x) { | ||
| margin.x = Math::round((video_mode.x - screen_size.x) / 2.0); | ||
| offset.x = Math::round(margin.x * viewport_size.y / screen_size.y); | ||
| } | ||
|
|
||
| if (screen_size.y < video_mode.y) { | ||
| margin.y = Math::round((video_mode.y - screen_size.y) / 2.0); | ||
| offset.y = Math::round(margin.y * viewport_size.x / screen_size.x); |
There was a problem hiding this comment.
This offset was unused, hence removing it.
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 #89578.
Supersedes #90257.
Haven't dived deep into the code (looked only into
Window::_update_viewport_size) so please test thoroughly. Firstly I've tried just adding a proper offset to themargin, it resulted in the opposite issue compared to #89578 (comment):Then I've noticed
marginis also applied towindow_transform, hence tried a separate additional offset just forattach_to_screen_rect. And that's this PR, seems to work. 🙃