-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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 Screengrab DPI scaling on Windows 10 version 1607+ #4000
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
nulano
commented
Jul 31, 2019
src/display.c
Outdated
@@ -329,6 +331,9 @@ PyImaging_GrabScreenWin32(PyObject* self, PyObject* args) | |||
HDC screen, screen_copy; | |||
DWORD rop; | |||
PyObject* buffer; | |||
HANDLE dpiAwareness; | |||
HMODULE user32 = LoadLibraryA("User32.dll"); | |||
Func_SetThreadDpiAwarenessContext SetThreadDpiAwarenessContext_function; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can someone suggest a better name here? This the best I could do but it's ridiculously long.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At least it's descriptive! :)
(cherry picked from commit 45ead62)
* Load User32 after possible return * Removed unused setting of variable
hugovk
approved these changes
Sep 26, 2019
PR 4000! 🍰 |
This was referenced Sep 30, 2019
Closed
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 #2438 and its duplicates #3432, #3626 for Windows 10 version 1607+ (Anniversary Update).
This PR uses
SetThreadDpiAwarenessContext
to temporarily make Python DPI aware. This function returns the previous awareness context, which is then used to restore the old value, thus avoiding problems with other parts of Python. It was added in Windows 10 version 1607, which is why it is called dynamically.The issue is not fixed for older versions of Windows. This is not a big problem for Windows 7, as very few people use DPI scaling there. Windows 8 and Windows 10 pre-1607 are now out of standard support by Microsoft.