From 596b017992013830bc33f581cd65d1999ed6448c Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sun, 27 Nov 2022 21:24:17 +0100 Subject: [PATCH] changed theme files --- customtkinter/assets/themes/dark-blue.json | 211 ++++++++++++------ .../test_theme_colors.py | 2 +- 2 files changed, 143 insertions(+), 70 deletions(-) diff --git a/customtkinter/assets/themes/dark-blue.json b/customtkinter/assets/themes/dark-blue.json index 0b1a33f..1ecf8ab 100644 --- a/customtkinter/assets/themes/dark-blue.json +++ b/customtkinter/assets/themes/dark-blue.json @@ -1,79 +1,152 @@ { - "color": { - "window_bg_color": ["gray98", "gray10"], - "button": ["#608BD5", "#395E9C"], - "button_hover": ["#A4BDE6", "#748BB3"], - "button_border": ["gray40", "gray70"], - "checkbox_border": ["gray40", "gray60"], - "checkmark": ["white", "gray90"], - "entry": ["white", "gray24"], - "entry_border": ["gray70", "gray32"], - "entry_placeholder_text": ["gray52", "gray62"], - "frame_border": ["#A7C2E0", "#5FB4DD"], - "frame_low": ["gray92", "gray16"], - "frame_high": ["gray86", "gray20"], - "label": [null, null], - "text": ["gray12", "gray90"], - "text_disabled": ["gray60", "gray50"], - "text_button_disabled": ["gray40", "gray74"], - "progressbar": ["#6B6B6B", "gray0"], - "progressbar_progress": ["#608BD5", "#395E9C"], - "progressbar_border": ["gray", "gray"], - "slider": ["#6B6B6B", "gray6"], - "slider_progress": ["gray70", "gray30"], - "slider_button": ["#608BD5", "#395E9C"], - "slider_button_hover": ["#A4BDE6", "#748BB3"], - "switch": ["gray70", "gray35"], - "switch_progress": ["#608BD5", "#395E9C"], - "switch_button": ["gray38", "gray70"], - "switch_button_hover": ["gray30", "gray90"], - "optionmenu_button": ["#36719F", "#144870"], - "optionmenu_button_hover": ["#27577D", "#203A4F"], - "combobox_border": ["gray70", "gray32"], - "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"] + "CTk": { + "fg_color": ["gray95", "gray10"] }, - "text": { + "CTkToplevel": { + "fg_color": ["gray95", "gray10"] + }, + "CTkFrame": { + "corner_radius": 6, + "border_width": 0, + "fg_color": ["gray90", "gray13"], + "top_fg_color": ["gray85", "gray16"], + "border_color": ["gray65", "gray28"] + }, + "CTkButton": { + "corner_radius": 6, + "border_width": 0, + "fg_color": ["#3a7ebf", "#1f538d"], + "hover_color": ["#325882", "#14375e"], + "border_color": ["#3E454A", "#949A9F"], + "text_color": ["#DCE4EE", "#DCE4EE"], + "text_color_disabled": ["gray74", "gray60"] + }, + "CTkLabel": { + "corner_radius": 0, + "fg_color": "transparent", + "text_color": ["gray14", "gray84"] + }, + "CTkEntry": { + "corner_radius": 6, + "border_width": 2, + "fg_color": ["#F9F9FA", "#343638"], + "border_color": ["#979DA2", "#565B5E"], + "text_color": ["gray14", "gray84"], + "placeholder_text_color": ["gray52", "gray62"] + }, + "CTkCheckbox": { + "corner_radius": 6, + "border_width": 3, + "fg_color": ["#3a7ebf", "#1f538d"], + "border_color": ["#3E454A", "#949A9F"], + "hover_color": ["#325882", "#14375e"], + "checkmark_color": ["#DCE4EE", "gray90"], + "text_color": ["gray14", "gray84"], + "text_color_disabled": ["gray60", "gray45"] + }, + "CTkSwitch": { + "corner_radius": 1000, + "border_width": 3, + "button_length": 0, + "fg_Color": ["#939BA2", "#4A4D50"], + "progress_color": ["#3a7ebf", "#1f538d"], + "button_color": ["gray36", "#D5D9DE"], + "button_hover_color": ["gray20", "gray100"], + "text_color": ["gray14", "gray84"], + "text_color_disabled": ["gray60", "gray45"] + }, + "CTkRadiobutton": { + "corner_radius": 1000, + "border_width_checked": 6, + "border_width_unchecked": 3, + "fg_color": ["#3a7ebf", "#1f538d"], + "border_color": ["#3E454A", "#949A9F"], + "hover_color": ["#325882", "#14375e"], + "text_color": ["gray14", "gray84"], + "text_color_disabled": ["gray60", "gray45"] + }, + "CTkProgressBar": { + "corner_radius": 1000, + "border_width": 0, + "fg_color": ["#939BA2", "#4A4D50"], + "progress_color": ["#3a7ebf", "#1f538d"], + "border_color": ["gray", "gray"] + }, + "CTkSlider": { + "corner_radius": 1000, + "button_corner_radius": 1000, + "border_width": 6, + "button_length": 0, + "fg_color": ["#939BA2", "#4A4D50"], + "progress_color": ["gray40", "#AAB0B5"], + "button_color": ["#3a7ebf", "#1f538d"], + "button_hover_color": ["#325882", "#14375e"] + }, + "CTkOptionMenu": { + "corner_radius": 6, + "fg_color": ["#3a7ebf", "#1f538d"], + "button_color": ["#325882", "#14375e"], + "button_hover_color": ["#234567", "#1e2c40"], + "text_color": ["#DCE4EE", "#DCE4EE"], + "text_color_disabled": ["gray74", "gray60"] + }, + "CTkComboBox": { + "corner_radius": 6, + "border_width": 2, + "fg_color": ["#F9F9FA", "#343638"], + "border_color": ["#979DA2", "#565B5E"], + "button_color": ["#979DA2", "#565B5E"], + "button_hover_color": ["#6E7174", "#7A848D"], + "text_color": ["gray14", "gray84"], + "text_color_disabled": ["gray50", "gray45"] + }, + "CTkScrollbar": { + "corner_radius": 1000, + "border_spacing": 4, + "fg_color": "transparent", + "button_color": ["gray55", "gray41"], + "button_hover_color": ["gray40", "gray53"] + }, + "CTkSegmentedButton": { + "corner_radius": 6, + "border_width": 2, + "fg_color": ["#979DA2", "gray29"], + "selected_color": ["#3a7ebf", "#1f538d"], + "selected_hover_color": ["#325882", "#14375e"], + "unselected_color": ["#979DA2", "gray29"], + "unselected_hover_color": ["gray70", "gray41"], + "text_color": ["#DCE4EE", "#DCE4EE"], + "text_color_disabled": ["gray74", "gray60"] + }, + "CTkTextbox": { + "corner_radius": 6, + "border_width": 0, + "fg_color": ["gray100", "gray20"], + "border_color": ["#979DA2", "#565B5E"], + "text_color": ["gray14", "gray84"], + "scrollbar_button_color": ["gray55", "gray41"], + "scrollbar_button_hover_color": ["gray40", "gray53"] + }, + "DropdownMenu": { + "fg_color": ["gray90", "gray20"], + "hover_color": ["gray75", "gray28"], + "text_color": ["gray14", "gray84"] + }, + "CTkFont": { "macOS": { - "font": "SF Display", - "size": -13 + "family": "SF Display", + "size": 13, + "weight": "normal" }, "Windows": { - "font": "Roboto", - "size": -13 + "family": "Roboto", + "size": 13, + "weight": "normal" }, "Linux": { - "font": "Roboto", - "size": -13 + "family": "Roboto", + "size": 13, + "weight": "normal" } - }, - "shape": { - "button_corner_radius": 8, - "button_border_width": 0, - "checkbox_corner_radius": 7, - "checkbox_border_width": 3, - "radiobutton_corner_radius": 1000, - "radiobutton_border_width_unchecked": 3, - "radiobutton_border_width_checked": 6, - "entry_border_width": 2, - "frame_corner_radius": 10, - "frame_border_width": 0, - "label_corner_radius": 0, - "progressbar_border_width": 0, - "progressbar_corner_radius": 1000, - "slider_border_width": 6, - "slider_corner_radius": 8, - "slider_button_length": 0, - "slider_button_corner_radius": 1000, - "switch_border_width": 3, - "switch_corner_radius": 1000, - "switch_button_corner_radius": 1000, - "switch_button_length": 0, - "scrollbar_corner_radius": 1000, - "scrollbar_border_spacing": 4 } } diff --git a/test/manual_integration_tests/test_theme_colors.py b/test/manual_integration_tests/test_theme_colors.py index e1fe20c..a2b0721 100644 --- a/test/manual_integration_tests/test_theme_colors.py +++ b/test/manual_integration_tests/test_theme_colors.py @@ -2,7 +2,7 @@ import tkinter import customtkinter customtkinter.set_appearance_mode("dark") # Modes: "System" (standard), "Dark", "Light" -customtkinter.set_default_color_theme("blue") # Themes: "blue" (standard), "green", "dark-blue" +customtkinter.set_default_color_theme("dark-blue") # Themes: "blue" (standard), "green", "dark-blue" app = customtkinter.CTk() app.geometry("1100x900")