diff --git a/customtkinter/assets/themes/dark-blue.json b/customtkinter/assets/themes/dark-blue.json index bbe8d87..544c99a 100644 --- a/customtkinter/assets/themes/dark-blue.json +++ b/customtkinter/assets/themes/dark-blue.json @@ -27,7 +27,13 @@ "switch_progress": ["#608BD5", "#395E9C"], "switch_button": ["gray38", "gray70"], "switch_button_hover": ["gray30", "gray90"], - "darken_factor": 0.8 + "optionmenu_button": ["#36719F", "#144870"], + "optionmenu_button_hover": ["#27577D", "#203A4F"], + "combobox_border": ["gray70", "gray32"], + "combobox_button_hover": ["#6E7174", "#7A848D"], + "dropdown_color": ["#A8ACB1", "#535353"], + "dropdown_hover": ["#D6DCE2", "#393D40"], + "dropdown_text": ["gray12", "gray90"] }, "text": { "macOS": { diff --git a/customtkinter/assets/themes/green.json b/customtkinter/assets/themes/green.json index d8de3f3..bc209c2 100644 --- a/customtkinter/assets/themes/green.json +++ b/customtkinter/assets/themes/green.json @@ -27,7 +27,13 @@ "switch_progress": ["#72CF9F", "#11B384"], "switch_button": ["gray38", "gray70"], "switch_button_hover": ["gray30", "gray90"], - "darken_factor": 0.8 + "optionmenu_button": ["#0E9670", "#0D8A66"], + "optionmenu_button_hover":["gray40", "gray70"], + "combobox_border": ["gray70", "gray32"], + "combobox_button_hover": ["#6E7174", "#7A848D"], + "dropdown_color": ["#A8ACB1", "#535353"], + "dropdown_hover": ["#D6DCE2", "#393D40"], + "dropdown_text": ["gray12", "gray90"] }, "text": { "macOS": { @@ -66,4 +72,4 @@ "switch_button_corner_radius": 1000, "switch_button_length": 0 } -} \ No newline at end of file +} diff --git a/test/manual_integration_tests/test_optionmenu_combobox.py b/test/manual_integration_tests/test_optionmenu_combobox.py index 9c33b4f..7543105 100644 --- a/test/manual_integration_tests/test_optionmenu_combobox.py +++ b/test/manual_integration_tests/test_optionmenu_combobox.py @@ -1,9 +1,8 @@ import tkinter -import tkinter.ttk as ttk import customtkinter app = customtkinter.CTk() -app.title('test_optionmenu.py') +app.title('Test OptionMenu ComboBox.py') app.geometry('400x300') @@ -17,16 +16,16 @@ countries = ['Bahamas', 'Canada', 'Cuba', 'United States'] variable = tkinter.StringVar() variable.set("test") -optionmenu_tk = tkinter.OptionMenu(app, variable, *countries, command=select_callback) -optionmenu_tk.pack(pady=10, padx=10) +# optionmenu_tk = tkinter.OptionMenu(app, variable, *countries, command=select_callback) +# optionmenu_tk.pack(pady=10, padx=10) optionmenu_1 = customtkinter.CTkOptionMenu(app, variable=variable, values=countries, command=select_callback) -optionmenu_1.pack(pady=10, padx=10) +optionmenu_1.pack(pady=20, padx=10) -combobox_tk = ttk.Combobox(app, values=countries) -combobox_tk.pack(pady=10, padx=10) +# combobox_tk = ttk.Combobox(app, values=countries) +# combobox_tk.pack(pady=10, padx=10) combobox_1 = customtkinter.CTkComboBox(app, variable=variable, values=countries, command=select_callback) -combobox_1.pack(pady=10, padx=10) +combobox_1.pack(pady=20, padx=10) app.mainloop()