diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2017-09-21 08:20:06 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-21 08:20:06 (GMT) |
commit | a96c96f5dab68d4e611af4b8caefd7268533fd9a (patch) | |
tree | 938b41feb0a8e91bbec971916156274469547ef5 /Lib | |
parent | 3d1e2ab584ed0175592b5be2a0bc98dc1723776a (diff) | |
download | cpython-a96c96f5dab68d4e611af4b8caefd7268533fd9a.zip cpython-a96c96f5dab68d4e611af4b8caefd7268533fd9a.tar.gz cpython-a96c96f5dab68d4e611af4b8caefd7268533fd9a.tar.bz2 |
bpo-31500: IDLE: Scale default fonts on HiDPI displays. (#3639)
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/idlelib/filelist.py | 2 | ||||
-rwxr-xr-x | Lib/idlelib/pyshell.py | 4 | ||||
-rw-r--r-- | Lib/idlelib/run.py | 13 |
3 files changed, 19 insertions, 0 deletions
diff --git a/Lib/idlelib/filelist.py b/Lib/idlelib/filelist.py index f46ad7c..5e1a3dc 100644 --- a/Lib/idlelib/filelist.py +++ b/Lib/idlelib/filelist.py @@ -113,8 +113,10 @@ class FileList: def _test(): from idlelib.editor import fixwordbreaks + from idlelib.run import fix_scaling import sys root = Tk() + fix_scaling(root) fixwordbreaks(root) root.withdraw() flist = FileList(root) diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index 47df744..168eeae 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -12,6 +12,8 @@ import tkinter.messagebox as tkMessageBox if TkVersion < 8.5: root = Tk() # otherwise create root in main root.withdraw() + from idlelib.run import fix_scaling + fix_scaling(root) tkMessageBox.showerror("Idle Cannot Start", "Idle requires tcl/tk 8.5+, not %s." % TkVersion, parent=root) @@ -1457,6 +1459,8 @@ def main(): NoDefaultRoot() root = Tk(className="Idle") root.withdraw() + from idlelib.run import fix_scaling + fix_scaling(root) # set application icon icondir = os.path.join(os.path.dirname(__file__), 'Icons') diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 9f6604b..39e0c11 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -184,6 +184,7 @@ def show_socket_error(err, address): import tkinter from tkinter.messagebox import showerror root = tkinter.Tk() + fix_scaling(root) root.withdraw() msg = f"IDLE's subprocess can't connect to {address[0]}:{address[1]}.\n"\ f"Fatal OSError #{err.errno}: {err.strerror}.\n"\ @@ -277,6 +278,18 @@ def exit(): sys.exit(0) +def fix_scaling(root): + """Scale fonts on HiDPI displays.""" + import tkinter.font + scaling = float(root.tk.call('tk', 'scaling')) + if scaling > 1.4: + for name in tkinter.font.names(root): + font = tkinter.font.Font(root=root, name=name, exists=True) + size = int(font['size']) + if size < 0: + font['size'] = round(-0.75*size) + + class MyRPCServer(rpc.RPCServer): def handle_error(self, request, client_address): |