Skip to content

gh-119459: Fix HiDPI blurring of every program window that using tkinter #119902

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.

Sign up for GitHub

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

Open
Wulian233 wants to merge 8 commits into
base: main
Choose a base branch
from
Open

gh-119459: Fix HiDPI blurring of every program window that using tkinter #119902

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
603ded3
Fix for HiDPI screens on Windows
Wulian233 Jun 1, 2024
a7bc67b
news
Wulian233 Jun 1, 2024
ba34aa5
finish
Wulian233 Jun 2, 2024
58af786
except (ImportError, AttributeError, OSError)
Wulian233 Jun 4, 2024
f3e7bb6
typo
Wulian233 Jun 4, 2024
a2163a7
revert ACKS
Wulian233 Jun 14, 2024
c9f9edf
Ensures that the window size is not reduced due to DPI adjustments, m…
Wulian233 Jun 22, 2024
34840e9
Merge remote-tracking branch 'origin/pr' into pr
Wulian233 Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Lib/idlelib/pyshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"Your Python may not be configured for Tk. **", file=sys.__stderr__)
raise SystemExit(1)

if sys.platform == 'win32':
from idlelib.util import fix_win_hidpi
fix_win_hidpi()

from tkinter import messagebox

from code import InteractiveInterpreter
Expand Down
15 changes: 0 additions & 15 deletions Lib/idlelib/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,11 @@
* std streams (pyshell, run),
* warning stuff (pyshell, run).
"""
import sys

# .pyw is for Windows; .pyi is for typing stub files.
# The extension order is needed for iomenu open/save dialogs.
py_extensions = ('.py', '.pyw', '.pyi')


# Fix for HiDPI screens on Windows. CALL BEFORE ANY TK OPERATIONS!
# URL for arguments for the ...Awareness call below.
# https://msdn.microsoft.com/en-us/library/windows/desktop/dn280512(v=vs.85).aspx
if sys.platform == 'win32': # pragma: no cover
def fix_win_hidpi(): # Called in pyshell and turtledemo.
try:
import ctypes
PROCESS_SYSTEM_DPI_AWARE = 1 # Int required.
ctypes.OleDLL('shcore').SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE)
except (ImportError, AttributeError, OSError):
pass


if __name__ == '__main__':
from unittest import main
main('idlelib.idle_test.test_util', verbosity=2)
16 changes: 16 additions & 0 deletions Lib/tkinter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,6 +2464,22 @@ def __init__(self, screenName=None, baseName=None, className='Tk',
if not sys.flags.ignore_environment:
# Issue #16248: Honor the -E flag to avoid code injection.
self.readprofile(baseName, className)
# Fix for HiDPI screens on Windows
# CALL BEFORE ANY TK OPERATIONS!
# URL for arguments for the ...Awareness call below.
# https://msdn.microsoft.com/en-us/library/windows/desktop/dn280512(v=vs.85).aspx
if sys.platform == 'win32':
import ctypes
try:
# >= win 8.1
PROCESS_SYSTEM_DPI_AWARE: int = 1 # Int required
ctypes.windll.shcore.SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE)
except (ImportError, AttributeError, OSError):
try:
# win 8.0 or less
ctypes.windll.user32.SetProcessDPIAware()
except Exception:
Comment thread
Wulian233 marked this conversation as resolved.
Outdated
pass

def loadtk(self):
if not self._tkloaded:
Expand Down
4 changes: 0 additions & 4 deletions Lib/turtledemo/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@
import turtle
from turtledemo import __doc__ as about_turtledemo

if sys.platform == 'win32':
from idlelib.util import fix_win_hidpi
fix_win_hidpi()

demo_dir = os.path.dirname(os.path.abspath(__file__))
darwin = sys.platform == 'darwin'
STARTUP = 1
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@ Ivan Levkivskyi
Ben Lewis
William Lewis
Akira Li
Jiahao Li
Robert Li
Xuanji Li
Zekun Li
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2024-06-01-19-07-55.gh-issue-119459.WRP-4n.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix HiDPI blurring of every program window that using tkinter. Patch by
Wulian233