Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix non-HiDPI mode on HiDPI displays on macOS Catalina. #32809

Merged
merged 1 commit into from Oct 13, 2019

Conversation

@bruvzg
Copy link
Member

bruvzg commented Oct 13, 2019

Fixes #32805

On macOS 10.15 HiDPI support is on by default, we need to directly specify we do not need scaling if HiDPI is not allowed by project settings.

@AlexRixhardson

This comment has been minimized.

Copy link
Contributor

AlexRixhardson commented Oct 13, 2019

Tested on MacBook Pro (Retina, Mid 2012) and it works perfectly. Thanks!

@AlexRixhardson

This comment has been minimized.

Copy link
Contributor

AlexRixhardson commented Oct 13, 2019

I recommend this patch to be put into the 3.2 milestone.

@akien-mga akien-mga added this to the 3.2 milestone Oct 13, 2019
@akien-mga akien-mga merged commit 1fed266 into godotengine:master Oct 13, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Oct 13, 2019

Thanks!

@bruvzg bruvzg deleted the bruvzg:macos_1015_non_hidpi_fix branch Oct 14, 2019
@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Oct 25, 2019

Cherry-picked for 3.1.2.

@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Oct 25, 2019

Cherry-picked for 3.0.7.

@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Oct 25, 2019

@bruvzg For the 2.1 branch only half of the patch applies properly (the added else branch). Do you think it's sufficient or are more changes needed there?

@bruvzg

This comment has been minimized.

Copy link
Member Author

bruvzg commented Oct 25, 2019

Do you think it's sufficient or are more changes needed there?

  • First part is to change scale on moving from one screen to another (having retina MacBook with non-retina secondary display is pretty common).

It's better to add whole if-else for the first part os_osx.mm#L340-L344 and the change in this line os_osx.mm#L348 (cherrypick #11718 changes).

  • Second part is for the new window creation and should apply as is.
@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Oct 25, 2019

Thanks for the details! I wouldn't be able to test the changes myself beyond ensuring that it compiles, so if you're able to do and test the relevant cherry-picks for 2.1, that would be very helpful.
We don't necessarily need to backport full blown HiDPI support if it was lacking in the 2.1 branch, as long as we keep the current state working (so satisfying Catalina's new requirements).

bruvzg added a commit to bruvzg/godot that referenced this pull request Dec 12, 2019
…r rebase.
bruvzg added a commit to bruvzg/godot that referenced this pull request Dec 12, 2019
…r rebase.
akien-mga added a commit that referenced this pull request Dec 12, 2019
[Vulkan] Restore parts of #33783 and #32809 missing after rebase.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.