https://github.com/python/cpython/commit/af5a324843de395cecc562cb0c757b3768f... commit: af5a324843de395cecc562cb0c757b3768f2077f branch: main author: Terry Jan Reedy <tjreedy@udel.edu> committer: terryjreedy <tjreedy@udel.edu> date: 2021-05-29T03:19:50-04:00 summary: 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. files: A Misc/NEWS.d/next/Library/2021-05-29-01-05-43.bpo-44254.f06xDm.rst M Lib/turtledemo/__main__.py diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py index 12be5098dad274..caea022da4a688 100755 --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -124,7 +124,6 @@ def getExampleEntries(): ) - class DemoWindow(object): def __init__(self, filename=None): @@ -171,15 +170,23 @@ def __init__(self, filename=None): 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 @@ def update_mousewheel(self, event): 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): diff --git a/Misc/NEWS.d/next/Library/2021-05-29-01-05-43.bpo-44254.f06xDm.rst b/Misc/NEWS.d/next/Library/2021-05-29-01-05-43.bpo-44254.f06xDm.rst new file mode 100644 index 00000000000000..7438d5ce044b87 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-05-29-01-05-43.bpo-44254.f06xDm.rst @@ -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.