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
commit 73ab410a96
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
customtkinter/assets/themes/sweetkind.json
View File

@ -1,41 +1,41 @@
{
"color": {
"window_bg_color": ["#181b28", "#181b28"],
"button": ["#212435", "#212435"],
"button_hover": ["#171926", "#171926"],
"button_border": ["#080b12", "#080b12"],
"window_bg_color": ["#ebf0f5", "#181b28"],
"button": ["#e46bff", "#212435"],
"button_hover": ["#8593d6", "#171926"],
"button_border": ["#525983", "#080b12"],
"checkbox_border": ["#01e9c4", "#01e9c4"],
"checkmark": ["#01e9c4", "#01e9c4"],
"entry": ["#212435", "#212435"],
"entry_border": ["#080b12", "#080b12"],
"entry": ["#dee2e7", "#212435"],
"entry_border": ["#fa00d0", "#080b12"],
"entry_placeholder_text": ["#cdc8ce", "#cdc8ce"],
"frame_border": ["#10121f", "#10121f"],
"frame_low": ["#181b28", "#181b28"],
"frame_high": ["#181b28", "#181b28"],
"frame_border": ["#525983", "#10121f"],
"frame_low": ["#dee2e7", "#181b28"],
"frame_high": ["#dee2e7", "#1b1e2d"],
"label": [null, null],
"text": ["#cdc8ce", "#cdc8ce"],
"text_disabled": ["#7a8894", "#7a8894"],
"text": ["#0c0e14", "#cdc8ce"],
"text_disabled": ["#5e6062", "#7a8894"],
"text_button_disabled": ["#7a8894", "#7a8894"],
"progressbar": ["#c452f8", "#c452f8"],
"progressbar": ["#fa00d0", "#fa00d0"],
"progressbar_progress": ["#363844", "#363844"],
"progressbar_border": ["#0d101f", "#0d101f"],
"slider": ["#c452f8", "#c452f8"],
"slider_progress": ["#363844", "#363844"],
"slider_button": ["#5b40c5", "#5b40c5"],
"slider_button_hover": ["#c452f8", "#c452f8"],
"switch": ["#1f2233", "#1f2233"],
"progressbar_border": ["#fa00d0", "#0d101f"],
"slider": ["#fa00d0", "#fa00d0"],
"slider_progress": ["#0d101f", "#0d101f"],
"slider_button": ["#fa00d0", "#fa00d0"],
"slider_button_hover": ["#e46bff", "#fa00d0"],
"switch": ["#7681be", "#1f2233"],
"switch_progress": ["#00e6c3", "#00e6c3"],
"switch_button": ["#2e324a", "#2e324a"],
"switch_button_hover": ["#2e324a", "#2e324a"],
"optionmenu_button": ["#36719F", "#144870"],
"optionmenu_button_hover": ["#27577D", "#203A4F"],
"combobox_border": ["#979DA2", "#565B5E"],
"combobox_button_hover": ["#6E7174", "#7A848D"],
"dropdown_color": ["gray90", "gray20"],
"dropdown_hover": ["gray75", "gray28"],
"dropdown_text": ["gray10", "#DCE4EE"],
"scrollbar_button": ["gray55", "gray41"],
"scrollbar_button_hover": ["gray40", "gray53"]
"switch_button": ["#525983", "#2e324a"],
"switch_button_hover": ["#fa00d0", "#2e324a"],
"optionmenu_button": ["#525983", "#080b12"],
"optionmenu_button_hover": ["#fa00d0", "#080b12"],
"combobox_border": ["#525983", "#080b12"],
"combobox_button_hover": ["#fa00d0", "#fa00d0"],
"dropdown_color": ["#dee2e7", "#212435"],
"dropdown_hover": ["#fa00d0", "#fa00d0"],
"dropdown_text": ["#0c0e14", "#cdc8ce"],
"scrollbar_button": ["#fa00d0", "#fa00d0"],
"scrollbar_button_hover": ["#9b45ff", "#9b45ff"]
},
"text": {
"macOS": {
@ -53,16 +53,16 @@
},
"shape": {
"button_corner_radius": 8,
"button_border_width": 2,
"button_border_width": 1,
"checkbox_corner_radius": 7,
"checkbox_border_width": 3,
"checkbox_border_width": 1,
"radiobutton_corner_radius": 1000,
"radiobutton_border_width_unchecked": 3,
"radiobutton_border_width_unchecked": 2,
"radiobutton_border_width_checked": 6,
"entry_border_width": 2,
"entry_border_width": 1,
"frame_corner_radius": 10,
"frame_border_width": 2,
"label_corner_radius": 0,
"frame_border_width": 1,
"label_corner_radius": 3,
"progressbar_border_width": 2,
"progressbar_corner_radius": 1000,
"slider_border_width": 6,

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: