Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-128062: Fix the font size and shortcut display of the turtledemo menu (#128063) 

Leave the font of the menu bar the default to keep it consistent with the rest of the world. Display the shortcut keys in the right way, using the 'accelerator' option.
---------

Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
This commit is contained in:
Zhikang Yan 2024-12-20 04:24:47 +08:00 committed by GitHub
parent 1b15c89a17
commit e163e8d4e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/turtledemo/__main__.py
View File

@ -105,7 +105,6 @@
DONE = 4
EVENTDRIVEN = 5
menufont = ("Arial", 12, NORMAL)
btnfont = ("Arial", 12, 'bold')
txtfont = ['Lucida Console', 10, 'normal']
@ -297,23 +296,21 @@ def makeLoadDemoMenu(self, master):
for entry in getExampleEntries():
def load(entry=entry):
self.loadfile(entry)
menu.add_command(label=entry, underline=0,
font=menufont, command=load)
menu.add_command(label=entry, underline=0, command=load)
return menu
def makeFontMenu(self, master):
menu = Menu(master, tearoff=0)
menu.add_command(label="Decrease (C-'-')", command=self.decrease_size,
font=menufont)
menu.add_command(label="Increase (C-'+')", command=self.increase_size,
font=menufont)
menu.add_command(label="Decrease", command=self.decrease_size,
accelerator=f"{'Command' if darwin else 'Ctrl'}+-")
menu.add_command(label="Increase", command=self.increase_size,
accelerator=f"{'Command' if darwin else 'Ctrl'}+=")
menu.add_separator()
for size in font_sizes:
def resize(size=size):
self.set_txtsize(size)
menu.add_command(label=str(size), underline=0,
font=menufont, command=resize)
menu.add_command(label=str(size), underline=0, command=resize)
return menu
def makeHelpMenu(self, master):
@ -322,7 +319,7 @@ def makeHelpMenu(self, master):
for help_label, help_file in help_entries:
def show(help_label=help_label, help_file=help_file):
view_text(self.root, help_label, help_file)
menu.add_command(label=help_label, font=menufont, command=show)
menu.add_command(label=help_label, command=show)
return menu
def refreshCanvas(self):

2
Misc/NEWS.d/next/Library/2024-12-18-10-18-55.gh-issue-128062.E9oU7-.rst Normal file
View File

@ -0,0 +1,2 @@
Revert the font of :mod:`turtledemo`'s menu bar to its default value and
display the shortcut keys in the correct position.