mirror/CustomTkinter
1
0
Fork 0
mirror of https://github.com/TomSchimansky/CustomTkinter.git synced 2023-08-10 21:13:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
TomSchimansky
2022-08-05 15:37:42 +02:00
parent 9bdf2436f5 91efc0ffc1
commit 73ab410a96
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customtkinter/widgets/ctk_button.py
View File

@@ -362,7 +362,7 @@ class CTkButton(CTkBaseClass):
def clicked(self, event=None):
if self.command is not None:
if self.state is not tkinter.DISABLED:
if self.state != tkinter.DISABLED:
# click animation: change color with .on_leave() and back to normal after 100ms with click_animation()
self.on_leave()

2
customtkinter/widgets/widget_base_class.py
View File

@@ -153,7 +153,7 @@ class CTkBaseClass(tkinter.Frame):
# if fg_color of master is None, try to retrieve fg_color from master of master
elif hasattr(master_widget.master, "master"):
return self.detect_color_of_master(self.master.master)
return self.detect_color_of_master(master_widget.master)
elif isinstance(master_widget, (ttk.Frame, ttk.LabelFrame, ttk.Notebook, ttk.Label)): # master is ttk widget
try: