From 5bff3c86ab77e9d831b3cd19b45654c7eef22931 Mon Sep 17 00:00:00 2001 From: Tal Einat Date: Mon, 17 Jun 2019 22:41:00 +0300 Subject: [PATCH] bpo-37039: Make IDLE's Zoom Height adjust to users' screens (GH-13678) Measure required height by quickly maximizing once per screen. A search for a better method failed. --- Doc/library/idle.rst | 5 +- Lib/idlelib/NEWS.txt | 8 ++ Lib/idlelib/help.html | 16 ++- Lib/idlelib/zoomheight.py | 119 ++++++++++++++---- .../2019-06-04-23-27-33.bpo-37039.FN_fBf.rst | 4 + 5 files changed, 124 insertions(+), 28 deletions(-) create mode 100644 Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index bd24695c728..d494c9766eb 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -289,7 +289,10 @@ Show/Hide Code Context (Editor Window only) Zoom/Restore Height Toggles the window between normal size and maximum height. The initial size defaults to 40 lines by 80 chars unless changed on the General tab of the - Configure IDLE dialog. + Configure IDLE dialog. The maximum height for a screen is determined by + momentarily maximizing a window the first time one is zoomed on the screen. + Changing screen settings may invalidate the saved height. This toogle has + no effect when a window is maximized. Window menu (Shell and Editor) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 982af776725..7646aed5936 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,14 @@ Released on 2019-10-20? ====================================== +bpo-37039: Adjust "Zoom Height" to individual screens by momemtarily +maximizing the window on first use with a particular screen. Changing +screen settings may invalidate the saved height. While a window is +maximized, "Zoom Height" has no effect. + +bpo-35763: Make calltip reminder about '/' meaning positional-only less +obtrusive by only adding it when there is room on the first line. + bpo-35610: Replace now redundant editor.context_use_ps1 with .prompt_last_line. This finishes change started in bpo-31858. diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index 228b3195cf9..e27ec8d6e17 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -6,7 +6,7 @@ - IDLE — Python 3.8.0a4 documentation + IDLE — Python 3.9.0a0 documentation @@ -19,7 +19,7 @@ @@ -50,6 +50,7 @@ +
@@ -912,7 +916,7 @@ also used for testing.

  • - 3.8.0a4 Documentation » + 3.9.0a0 Documentation »
  • The Python Standard Library »
    • @@ -943,7 +947,7 @@ also used for testing.



    - Last updated on May 25, 2019. + Last updated on Jun 17, 2019. Found a bug?
    diff --git a/Lib/idlelib/zoomheight.py b/Lib/idlelib/zoomheight.py index 523f5d51e02..cd50c91c183 100644 --- a/Lib/idlelib/zoomheight.py +++ b/Lib/idlelib/zoomheight.py @@ -2,42 +2,119 @@ import re import sys +import tkinter -from idlelib import macosx + +class WmInfoGatheringError(Exception): + pass class ZoomHeight: + # Cached values for maximized window dimensions, one for each set + # of screen dimensions. + _max_height_and_y_coords = {} def __init__(self, editwin): self.editwin = editwin + self.top = self.editwin.top def zoom_height_event(self, event=None): - top = self.editwin.top - zoomed = zoom_height(top) - menu_status = 'Restore' if zoomed else 'Zoom' - self.editwin.update_menu_label(menu='options', index='* Height', - label=f'{menu_status} Height') + zoomed = self.zoom_height() + + if zoomed is None: + self.top.bell() + else: + menu_status = 'Restore' if zoomed else 'Zoom' + self.editwin.update_menu_label(menu='options', index='* Height', + label=f'{menu_status} Height') + return "break" + def zoom_height(self): + top = self.top -def zoom_height(top): + width, height, x, y = get_window_geometry(top) + + if top.wm_state() != 'normal': + # Can't zoom/restore window height for windows not in the 'normal' + # state, e.g. maximized and full-screen windows. + return None + + try: + maxheight, maxy = self.get_max_height_and_y_coord() + except WmInfoGatheringError: + return None + + if height != maxheight: + # Maximize the window's height. + set_window_geometry(top, (width, maxheight, x, maxy)) + return True + else: + # Restore the window's height. + # + # .wm_geometry('') makes the window revert to the size requested + # by the widgets it contains. + top.wm_geometry('') + return False + + def get_max_height_and_y_coord(self): + top = self.top + + screen_dimensions = (top.winfo_screenwidth(), + top.winfo_screenheight()) + if screen_dimensions not in self._max_height_and_y_coords: + orig_state = top.wm_state() + + # Get window geometry info for maximized windows. + try: + top.wm_state('zoomed') + except tkinter.TclError: + # The 'zoomed' state is not supported by some esoteric WMs, + # such as Xvfb. + raise WmInfoGatheringError( + 'Failed getting geometry of maximized windows, because ' + + 'the "zoomed" window state is unavailable.') + top.update() + maxwidth, maxheight, maxx, maxy = get_window_geometry(top) + if sys.platform == 'win32': + # On Windows, the returned Y coordinate is the one before + # maximizing, so we use 0 which is correct unless a user puts + # their dock on the top of the screen (very rare). + maxy = 0 + maxrooty = top.winfo_rooty() + + # Get the "root y" coordinate for non-maximized windows with their + # y coordinate set to that of maximized windows. This is needed + # to properly handle different title bar heights for non-maximized + # vs. maximized windows, as seen e.g. in Windows 10. + top.wm_state('normal') + top.update() + orig_geom = get_window_geometry(top) + max_y_geom = orig_geom[:3] + (maxy,) + set_window_geometry(top, max_y_geom) + top.update() + max_y_geom_rooty = top.winfo_rooty() + + # Adjust the maximum window height to account for the different + # title bar heights of non-maximized vs. maximized windows. + maxheight += maxrooty - max_y_geom_rooty + + self._max_height_and_y_coords[screen_dimensions] = maxheight, maxy + + set_window_geometry(top, orig_geom) + top.wm_state(orig_state) + + return self._max_height_and_y_coords[screen_dimensions] + + +def get_window_geometry(top): geom = top.wm_geometry() m = re.match(r"(\d+)x(\d+)\+(-?\d+)\+(-?\d+)", geom) - if not m: - top.bell() - return - width, height, x, y = map(int, m.groups()) - newheight = top.winfo_screenheight() + return tuple(map(int, m.groups())) - # The constants below for Windows and Mac Aqua are visually determined - # to avoid taskbar or menubar and app icons. - newy, bot_y = ((0, 72) if sys.platform == 'win32' else - (22, 88) if macosx.isAquaTk() else - (0, 88) ) # Guess for anything else. - newheight = newheight - newy - bot_y - newgeom = '' if height >= newheight else f"{width}x{newheight}+{x}+{newy}" - top.wm_geometry(newgeom) - return newgeom != "" + +def set_window_geometry(top, geometry): + top.wm_geometry("{:d}x{:d}+{:d}+{:d}".format(*geometry)) if __name__ == "__main__": diff --git a/Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst b/Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst new file mode 100644 index 00000000000..71c8c892ba6 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst @@ -0,0 +1,4 @@ +Adjust "Zoom Height" to individual screens by momemtarily maximizing the +window on first use with a particular screen. Changing screen settings +may invalidate the saved height. While a window is maximized, +"Zoom Height" has no effect.