bpo-33987: Use master ttk Frame for IDLE config dialog (GH-22943)

This commit is contained in:
Mark Roseman 2020-10-24 16:45:00 -07:00 committed by GitHub
parent e53e54425d
commit c579ad14d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions

View File

@ -67,7 +67,6 @@ class ConfigDialog(Toplevel):
if not _utest: if not _utest:
self.withdraw() self.withdraw()
self.configure(borderwidth=5)
self.title(title or 'IDLE Preferences') self.title(title or 'IDLE Preferences')
x = parent.winfo_rootx() + 20 x = parent.winfo_rootx() + 20
y = parent.winfo_rooty() + (30 if not _htest else 150) y = parent.winfo_rooty() + (30 if not _htest else 150)
@ -97,6 +96,7 @@ class ConfigDialog(Toplevel):
"""Create and place widgets for tabbed dialog. """Create and place widgets for tabbed dialog.
Widgets Bound to self: Widgets Bound to self:
frame: encloses all other widgets
note: Notebook note: Notebook
highpage: HighPage highpage: HighPage
fontpage: FontPage fontpage: FontPage
@ -109,7 +109,9 @@ class ConfigDialog(Toplevel):
load_configs: Load pages except for extensions. load_configs: Load pages except for extensions.
activate_config_changes: Tell editors to reload. activate_config_changes: Tell editors to reload.
""" """
self.note = note = Notebook(self) self.frame = frame = Frame(self, padding="5px")
self.frame.grid(sticky="nwes")
self.note = note = Notebook(frame)
self.highpage = HighPage(note) self.highpage = HighPage(note)
self.fontpage = FontPage(note, self.highpage) self.fontpage = FontPage(note, self.highpage)
self.keyspage = KeysPage(note) self.keyspage = KeysPage(note)
@ -148,7 +150,7 @@ class ConfigDialog(Toplevel):
padding_args = {} padding_args = {}
else: else:
padding_args = {'padding': (6, 3)} padding_args = {'padding': (6, 3)}
outer = Frame(self, padding=2) outer = Frame(self.frame, padding=2)
buttons_frame = Frame(outer, padding=2) buttons_frame = Frame(outer, padding=2)
self.buttons = {} self.buttons = {}
for txt, cmd in ( for txt, cmd in (
@ -687,7 +689,7 @@ class HighPage(Frame):
def __init__(self, master): def __init__(self, master):
super().__init__(master) super().__init__(master)
self.cd = master.master self.cd = master.winfo_toplevel()
self.style = Style(master) self.style = Style(master)
self.create_page_highlight() self.create_page_highlight()
self.load_theme_cfg() self.load_theme_cfg()
@ -1346,7 +1348,7 @@ class KeysPage(Frame):
def __init__(self, master): def __init__(self, master):
super().__init__(master) super().__init__(master)
self.cd = master.master self.cd = master.winfo_toplevel()
self.create_page_keys() self.create_page_keys()
self.load_key_cfg() self.load_key_cfg()