[Python-checkins] [3.9] bpo-43655: Tkinter and IDLE dialog windows are now recognized as dialogs by window managers on macOS and X Window (GH-25187). (GH-25588) (GH-25592)

Sun Apr 25 07:19:56 EDT 2021

https://github.com/python/cpython/commit/6077efa2b2be17e736d061fe74f933dc616c64b2
commit: 6077efa2b2be17e736d061fe74f933dc616c64b2
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021年04月25日T14:19:52+03:00
summary:
[3.9] bpo-43655: Tkinter and IDLE dialog windows are now recognized as dialogs by window managers on macOS and X Window (GH-25187). (GH-25588) (GH-25592)
(cherry picked from commit 3bb3fb3be09d472a43cdc3d9d9578bd49f3dfb8c)
(cherry picked from commit 9a165399aec930f27639dd173426ccc33586662b)
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
files:
A Misc/NEWS.d/next/IDLE/2021-04-04-20-52-07.bpo-43655.HSyaKH.rst
A Misc/NEWS.d/next/Library/2021-04-04-20-51-19.bpo-43655.LwGy8R.rst
M Lib/idlelib/config_key.py
M Lib/idlelib/query.py
M Lib/idlelib/searchbase.py
M Lib/tkinter/filedialog.py
M Lib/tkinter/simpledialog.py

diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py
index 7510aa9f3d878..9ca3a156f4b97 100644
--- a/Lib/idlelib/config_key.py
+++ b/Lib/idlelib/config_key.py
@@ -4,6 +4,7 @@
 from tkinter import Toplevel, Listbox, StringVar, TclError
 from tkinter.ttk import Frame, Button, Checkbutton, Entry, Label, Scrollbar
 from tkinter import messagebox
+from tkinter.simpledialog import _setup_dialog
 import string
 import sys
 
@@ -63,6 +64,7 @@ def __init__(self, parent, title, action, current_key_sequences,
 self.resizable(height=False, width=False)
 self.title(title)
 self.transient(parent)
+ _setup_dialog(self)
 self.grab_set()
 self.protocol("WM_DELETE_WINDOW", self.cancel)
 self.parent = parent
diff --git a/Lib/idlelib/query.py b/Lib/idlelib/query.py
index 015fc7ade459d..fefa5aac1b7f5 100644
--- a/Lib/idlelib/query.py
+++ b/Lib/idlelib/query.py
@@ -28,6 +28,7 @@
 from tkinter.ttk import Frame, Button, Entry, Label, Checkbutton
 from tkinter import filedialog
 from tkinter.font import Font
+from tkinter.simpledialog import _setup_dialog
 
 class Query(Toplevel):
 """Base class for getting verified answer from a user.
@@ -60,13 +61,8 @@ def __init__(self, parent, title, message, *, text0='', used_names={},
 if not _utest: # Otherwise fail when directly run unittest.
 self.grab_set()
 
- windowingsystem = self.tk.call('tk', 'windowingsystem')
- if windowingsystem == 'aqua':
- try:
- self.tk.call('::tk::unsupported::MacWindowStyle', 'style',
- self._w, 'moveableModal', '')
- except:
- pass
+ _setup_dialog(self)
+ if self._windowingsystem == 'aqua':
 self.bind("<Command-.>", self.cancel)
 self.bind('<Key-Escape>', self.cancel)
 self.protocol("WM_DELETE_WINDOW", self.cancel)
diff --git a/Lib/idlelib/searchbase.py b/Lib/idlelib/searchbase.py
index fbef87aa2d3d0..64ed50c7364be 100644
--- a/Lib/idlelib/searchbase.py
+++ b/Lib/idlelib/searchbase.py
@@ -2,6 +2,7 @@
 
 from tkinter import Toplevel
 from tkinter.ttk import Frame, Entry, Label, Button, Checkbutton, Radiobutton
+from tkinter.simpledialog import _setup_dialog
 
 
 class SearchDialogBase:
@@ -83,6 +84,7 @@ def create_widgets(self):
 top.protocol("WM_DELETE_WINDOW", self.close)
 top.wm_title(self.title)
 top.wm_iconname(self.icon)
+ _setup_dialog(top)
 self.top = top
 self.frame = Frame(top, padding="5px")
 self.frame.grid(sticky="nwes")
diff --git a/Lib/tkinter/filedialog.py b/Lib/tkinter/filedialog.py
index 88d23476fde28..09ff1cb1cb63d 100644
--- a/Lib/tkinter/filedialog.py
+++ b/Lib/tkinter/filedialog.py
@@ -15,6 +15,7 @@
 from tkinter import *
 from tkinter.dialog import Dialog
 from tkinter import commondialog
+from tkinter.simpledialog import _setup_dialog
 
 import os
 import fnmatch
@@ -56,6 +57,7 @@ def __init__(self, master, title=None):
 self.top = Toplevel(master)
 self.top.title(title)
 self.top.iconname(title)
+ _setup_dialog(self.top)
 
 self.botframe = Frame(self.top)
 self.botframe.pack(side=BOTTOM, fill=X)
diff --git a/Lib/tkinter/simpledialog.py b/Lib/tkinter/simpledialog.py
index b882d47c961bd..802202560af52 100644
--- a/Lib/tkinter/simpledialog.py
+++ b/Lib/tkinter/simpledialog.py
@@ -39,6 +39,9 @@ def __init__(self, master,
 if title:
 self.root.title(title)
 self.root.iconname(title)
+
+ _setup_dialog(self.root)
+
 self.message = Message(self.root, text=text, aspect=400)
 self.message.pack(expand=1, fill=BOTH)
 self.frame = Frame(self.root)
@@ -142,6 +145,8 @@ def __init__(self, parent, title = None):
 if title:
 self.title(title)
 
+ _setup_dialog(self)
+
 self.parent = parent
 
 self.result = None
@@ -251,6 +256,13 @@ def apply(self):
 pass # override
 
 
+def _setup_dialog(w):
+ if w._windowingsystem == "aqua":
+ w.tk.call("::tk::unsupported::MacWindowStyle", "style",
+ w, "moveableModal", "")
+ elif w._windowingsystem == "x11":
+ w.wm_attributes("-type", "dialog")
+
 # --------------------------------------------------------------------
 # convenience dialogues
 
diff --git a/Misc/NEWS.d/next/IDLE/2021-04-04-20-52-07.bpo-43655.HSyaKH.rst b/Misc/NEWS.d/next/IDLE/2021-04-04-20-52-07.bpo-43655.HSyaKH.rst
new file mode 100644
index 0000000000000..105ec9281f005
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2021-04-04-20-52-07.bpo-43655.HSyaKH.rst
@@ -0,0 +1,2 @@
+IDLE dialog windows are now recognized as dialogs by window managers on
+macOS and X Window.
diff --git a/Misc/NEWS.d/next/Library/2021-04-04-20-51-19.bpo-43655.LwGy8R.rst b/Misc/NEWS.d/next/Library/2021-04-04-20-51-19.bpo-43655.LwGy8R.rst
new file mode 100644
index 0000000000000..7916d2248b231
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-04-04-20-51-19.bpo-43655.LwGy8R.rst
@@ -0,0 +1,2 @@
+:mod:`tkinter` dialog windows are now recognized as dialogs by window
+managers on macOS and X Window.
