Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-44254: On Mac, remove disfunctional colors from turtledemo buttons (GH-26448) 

On macOS, tk defers to system setting for button background when in normal state.
Give turtledemo button text a color that works on either light or dark background.
This commit is contained in:
Terry Jan Reedy 2021-05-29 03:19:50 -04:00 committed by GitHub
parent 43cf7c864a
commit af5a324843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Lib/turtledemo/__main__.py
View File

@ -124,7 +124,6 @@ help_entries = ( # (help_label, help_doc)
)
class DemoWindow(object):
def __init__(self, filename=None):
@ -171,15 +170,23 @@ class DemoWindow(object):
self.output_lbl = Label(root, height= 1, text=" --- ", bg="#ddf",
font=("Arial", 16, 'normal'), borderwidth=2,
relief=RIDGE)
self.start_btn = Button(root, text=" START ", font=btnfont,
fg="white", disabledforeground = "#fed",
command=self.startDemo)
self.stop_btn = Button(root, text=" STOP ", font=btnfont,
fg="white", disabledforeground = "#fed",
command=self.stopIt)
self.clear_btn = Button(root, text=" CLEAR ", font=btnfont,
fg="white", disabledforeground="#fed",
command = self.clearCanvas)
if darwin: # Leave Mac button colors alone - #44254.
self.start_btn = Button(root, text=" START ", font=btnfont,
fg='#00cc22', command=self.startDemo)
self.stop_btn = Button(root, text=" STOP ", font=btnfont,
fg='#00cc22', command=self.stopIt)
self.clear_btn = Button(root, text=" CLEAR ", font=btnfont,
fg='#00cc22', command = self.clearCanvas)
else:
self.start_btn = Button(root, text=" START ", font=btnfont,
fg="white", disabledforeground = "#fed",
command=self.startDemo)
self.stop_btn = Button(root, text=" STOP ", font=btnfont,
fg="white", disabledforeground = "#fed",
command=self.stopIt)
self.clear_btn = Button(root, text=" CLEAR ", font=btnfont,
fg="white", disabledforeground="#fed",
command = self.clearCanvas)
self.output_lbl.grid(row=1, column=0, sticky='news', padx=(0,5))
self.start_btn.grid(row=1, column=1, sticky='ew')
self.stop_btn.grid(row=1, column=2, sticky='ew')
@ -267,12 +274,17 @@ class DemoWindow(object):
return self.increase_size()
def configGUI(self, start, stop, clear, txt="", color="blue"):
self.start_btn.config(state=start,
bg="#d00" if start == NORMAL else "#fca")
self.stop_btn.config(state=stop,
bg="#d00" if stop == NORMAL else "#fca")
self.clear_btn.config(state=clear,
bg="#d00" if clear == NORMAL else "#fca")
if darwin: # Leave Mac button colors alone - #44254.
self.start_btn.config(state=start)
self.stop_btn.config(state=stop)
self.clear_btn.config(state=clear)
else:
self.start_btn.config(state=start,
bg="#d00" if start == NORMAL else "#fca")
self.stop_btn.config(state=stop,
bg="#d00" if stop == NORMAL else "#fca")
self.clear_btn.config(state=clear,
bg="#d00" if clear == NORMAL else "#fca")
self.output_lbl.config(text=txt, fg=color)
def makeLoadDemoMenu(self, master):

2
Misc/NEWS.d/next/Library/2021-05-29-01-05-43.bpo-44254.f06xDm.rst Normal file
View File

@ -0,0 +1,2 @@
On Mac, give turtledemo button text a color that works on both light
or dark background. Programmers cannot control the latter.