diff --git a/Readme.md b/Readme.md index 0de3def..36d2a2b 100644 --- a/Readme.md +++ b/Readme.md @@ -136,11 +136,13 @@ also look acceptable on Windows. Maybe you can use the parameters for Example 1:```examples/complex_example.py``` -![](documentation_images/Windows_light.png) +![](documentation_images/Windows_complex_light.png) + +![](documentation_images/Windows_complex_dark.png) Example 2: ```examples/complex_example_custom_colors.py``` -![](documentation_images/Windows_dark.png) +![](documentation_images/Windows_complex_other_style.png) ### CTkButton with images It's also possible to put an image on a CTkButton. You just have to diff --git a/customtkinter/__init__.py b/customtkinter/__init__.py index 112c346..9d49d5f 100644 --- a/customtkinter/__init__.py +++ b/customtkinter/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.8" +__version__ = "2.0" from .customtkinter_button import CTkButton from .customtkinter_slider import CTkSlider diff --git a/customtkinter/customtkinter_color_manager.py b/customtkinter/customtkinter_color_manager.py index 0440bdd..f92fb61 100644 --- a/customtkinter/customtkinter_color_manager.py +++ b/customtkinter/customtkinter_color_manager.py @@ -19,7 +19,6 @@ class CTkColorManager: @classmethod def initialize_color_theme(cls, theme_name): - print("set theme", theme_name) if theme_name.lower() == "blue": cls.WINDOW_BG = ("#ECECEC", "#323232") # macOS standard light and dark window bg colors diff --git a/customtkinter/customtkinter_entry.py b/customtkinter/customtkinter_entry.py index 9e4a790..b3d6901 100644 --- a/customtkinter/customtkinter_entry.py +++ b/customtkinter/customtkinter_entry.py @@ -75,7 +75,7 @@ class CTkEntry(tkinter.Frame): width=1, highlightthicknes=0, **kwargs) - self.entry.grid(column=0, row=0, sticky="we", padx=self.corner_radius if self.corner_radius >= 5 else 5) + self.entry.grid(column=0, row=0, sticky="we", padx=self.corner_radius if self.corner_radius >= 6 else 6) self.fg_parts = [] @@ -206,7 +206,7 @@ class CTkEntry(tkinter.Frame): elif self.corner_radius * 2 > self.width: self.corner_radius = self.width / 2 - self.entry.grid(column=0, row=0, sticky="we", padx=self.corner_radius if self.corner_radius >= 5 else 5) + self.entry.grid(column=0, row=0, sticky="we", padx=self.corner_radius if self.corner_radius >= 6 else 6) del kwargs["corner_radius"] require_redraw = True diff --git a/documentation_images/Windows_complex_dark.png b/documentation_images/Windows_complex_dark.png new file mode 100644 index 0000000..17a4d12 Binary files /dev/null and b/documentation_images/Windows_complex_dark.png differ diff --git a/documentation_images/Windows_complex_light.png b/documentation_images/Windows_complex_light.png new file mode 100644 index 0000000..e703eed Binary files /dev/null and b/documentation_images/Windows_complex_light.png differ diff --git a/documentation_images/Windows_complex_other_style.png b/documentation_images/Windows_complex_other_style.png new file mode 100644 index 0000000..5199065 Binary files /dev/null and b/documentation_images/Windows_complex_other_style.png differ diff --git a/documentation_images/Windows_dark.png b/documentation_images/Windows_dark.png deleted file mode 100755 index 9919add..0000000 Binary files a/documentation_images/Windows_dark.png and /dev/null differ diff --git a/documentation_images/Windows_light.png b/documentation_images/Windows_light.png deleted file mode 100755 index d1e92db..0000000 Binary files a/documentation_images/Windows_light.png and /dev/null differ diff --git a/documentation_images/complex_example_custom_colors.png b/documentation_images/complex_example_custom_colors.png index 50c6de1..3f1afb4 100644 Binary files a/documentation_images/complex_example_custom_colors.png and b/documentation_images/complex_example_custom_colors.png differ diff --git a/examples/example_background_image.py b/examples/example_background_image.py index 9371341..31d8ec4 100644 --- a/examples/example_background_image.py +++ b/examples/example_background_image.py @@ -42,20 +42,20 @@ class App(customtkinter.CTk): corner_radius=0) self.frame.place(relx=0.5, rely=0.5, anchor=tkinter.CENTER) - self.label_1 = customtkinter.CTkLabel(master=self.frame, corner_radius=10, width=200, height=60, + self.label_1 = customtkinter.CTkLabel(master=self.frame, corner_radius=6, width=200, height=60, fg_color=("gray70", "gray20"), text="CustomTkinter\ninterface example") self.label_1.place(relx=0.5, rely=0.3, anchor=tkinter.CENTER) - self.entry_1 = customtkinter.CTkEntry(master=self.frame, corner_radius=10, width=200) + self.entry_1 = customtkinter.CTkEntry(master=self.frame, corner_radius=20, width=200) self.entry_1.place(relx=0.5, rely=0.52, anchor=tkinter.CENTER) self.entry_1.insert(0, "username") - self.entry_2 = customtkinter.CTkEntry(master=self.frame, corner_radius=10, width=200, show="*") + self.entry_2 = customtkinter.CTkEntry(master=self.frame, corner_radius=20, width=200, show="*") self.entry_2.place(relx=0.5, rely=0.6, anchor=tkinter.CENTER) self.entry_2.insert(0, "password") self.button_2 = customtkinter.CTkButton(master=self.frame, text="Login", - corner_radius=10, command=self.button_event, width=200) + corner_radius=6, command=self.button_event, width=200) self.button_2.place(relx=0.5, rely=0.7, anchor=tkinter.CENTER) def button_event(self): diff --git a/setup.py b/setup.py index e7f32ba..6f5c40c 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def read(filename): setup(name="customtkinter", - version="1.8", + version="2.0", author="Tom Schimansky", license="Creative Commons Zero v1.0 Universal", url="https://github.com/TomSchimansky/CustomTkinter",