added new button grid system, fixed CTkSwitch grid positioning, moved ctk_canvas.py and draw_engine.py to widgets/core_rendering,

customtkinter/__init__.py

@@ -2,16 +2,13 @@ __version__ = "4.6.3"
 
 import os
 import sys
-from tkinter.constants import *
-from tkinter import StringVar, IntVar, DoubleVar, BooleanVar
-from tkinter import filedialog
 
 # import manager classes
 from .appearance_mode_tracker import AppearanceModeTracker
 from .theme_manager import ThemeManager
 from .scaling_tracker import ScalingTracker
 from .font_manager import FontManager
-from .draw_engine import DrawEngine
+from .widgets.core_rendering.draw_engine import DrawEngine
 
 AppearanceModeTracker.init_appearance_mode()
 
@@ -45,7 +42,7 @@ if FontManager.load_font(os.path.join(script_directory, "assets", "fonts", "Cust
     if DrawEngine.preferred_drawing_method == "font_shapes":
         sys.stderr.write("customtkinter.__init__ warning: " +
                          "Preferred drawing method 'font_shapes' can not be used because the font file could not be loaded.\n" +
-                         "Using 'circle_shapes' instead. The rendering quality will be bad!")
+                         "Using 'circle_shapes' instead. The rendering quality will be bad!\n")
         DrawEngine.preferred_drawing_method = "circle_shapes"
 
 # import widgets
@@ -58,7 +55,7 @@ from .widgets.ctk_frame import CTkFrame
 from .widgets.ctk_progressbar import CTkProgressBar
 from .widgets.ctk_label import CTkLabel
 from .widgets.ctk_radiobutton import CTkRadioButton
-from .widgets.ctk_canvas import CTkCanvas
+from .widgets.core_rendering.ctk_canvas import CTkCanvas
 from .widgets.ctk_switch import CTkSwitch
 from .widgets.ctk_optionmenu import CTkOptionMenu
 from .widgets.ctk_combobox import CTkComboBox
@@ -67,6 +64,8 @@ from .widgets.ctk_textbox import CTkTextbox
 from .widgets.ctk_tabview import CTkTabview
 from .widgets.ctk_segmented_button import CTkSegmentedButton
 
+from .widgets.ctk_button_new_grid import CTkButtonNewGrid
+
 # import windows
 from .windows.ctk_tk import CTk
 from .windows.ctk_toplevel import CTkToplevel

customtkinter/scaling_tracker.py

@@ -1,6 +1,6 @@
 import tkinter
 import sys
-from typing import Callable, Dict
+from typing import Callable
 
 
 class ScalingTracker:

customtkinter/widgets/__init__.py

@@ -1,3 +1,3 @@
-from .ctk_canvas import CTkCanvas
+from customtkinter.widgets.core_rendering.ctk_canvas import CTkCanvas
 
 CTkCanvas.init_font_character_mapping()

customtkinter/widgets/core_rendering/draw_engine.py

@@ -5,7 +5,7 @@ import tkinter
 from typing import Union, TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from .widgets.ctk_canvas import CTkCanvas
+    from customtkinter.widgets.core_rendering.ctk_canvas import CTkCanvas
 
 
 class DrawEngine:

customtkinter/widgets/ctk_button.py

@@ -2,9 +2,9 @@ import tkinter
 import sys
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 

customtkinter/widgets/ctk_checkbox.py

@@ -2,9 +2,9 @@ import tkinter
 import sys
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 

customtkinter/widgets/ctk_combobox.py

@@ -3,9 +3,9 @@ import sys
 from typing import Union, Tuple, Callable, List
 
 from .dropdown_menu import DropdownMenu
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 

customtkinter/widgets/ctk_entry.py

@@ -1,9 +1,9 @@
 import tkinter
 from typing import Union, Tuple
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 

customtkinter/widgets/ctk_frame.py

@@ -1,8 +1,8 @@
 from typing import Union, Tuple, List
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 
 

customtkinter/widgets/ctk_label.py

@@ -1,9 +1,9 @@
 import tkinter
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 

customtkinter/widgets/ctk_optionmenu.py

@@ -2,9 +2,9 @@ import tkinter
 import sys
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from .dropdown_menu import DropdownMenu
 from ..utility.ctk_font import CTkFont

customtkinter/widgets/ctk_progressbar.py

@@ -2,9 +2,9 @@ import tkinter
 import math
 from typing import Union, Tuple
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 
 

customtkinter/widgets/ctk_radiobutton.py

@@ -2,9 +2,9 @@ import tkinter
 import sys
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 

customtkinter/widgets/ctk_scrollbar.py

@@ -1,9 +1,9 @@
 import sys
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 
 

customtkinter/widgets/ctk_slider.py

@@ -2,9 +2,9 @@ import tkinter
 import sys
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 
 

customtkinter/widgets/ctk_switch.py

@@ -2,9 +2,9 @@ import tkinter
 import sys
 from typing import Union, Tuple, Callable
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 
@@ -90,9 +90,9 @@ class CTkSwitch(CTkBaseClass):
         self._textvariable = textvariable
 
         # configure grid system (3x1)
-        self.grid_columnconfigure(0, weight=1)
+        self.grid_columnconfigure(0, weight=0)
         self.grid_columnconfigure(1, weight=0, minsize=self._apply_widget_scaling(6))
-        self.grid_columnconfigure(2, weight=0)
+        self.grid_columnconfigure(2, weight=1)
 
         self._bg_canvas = CTkCanvas(master=self,
                                     highlightthickness=0,

customtkinter/widgets/ctk_tabview.py

@@ -4,8 +4,8 @@ from ..theme_manager import ThemeManager
 from .ctk_frame import CTkFrame
 from .widget_base_class import CTkBaseClass
 from .ctk_segmented_button import CTkSegmentedButton
-from .ctk_canvas import CTkCanvas
-from ..draw_engine import DrawEngine
+from .core_rendering.ctk_canvas import CTkCanvas
+from .core_rendering.draw_engine import DrawEngine
 
 
 class CTkTabview(CTkBaseClass):

customtkinter/widgets/ctk_textbox.py

@@ -1,10 +1,10 @@
 import tkinter
 from typing import Union, Tuple
 
-from .ctk_canvas import CTkCanvas
+from .core_rendering.ctk_canvas import CTkCanvas
 from .ctk_scrollbar import CTkScrollbar
 from ..theme_manager import ThemeManager
-from ..draw_engine import DrawEngine
+from .core_rendering.draw_engine import DrawEngine
 from .widget_base_class import CTkBaseClass
 from ..utility.ctk_font import CTkFont
 

customtkinter/widgets/dropdown_menu.py

@@ -1,7 +1,5 @@
 import tkinter
 import sys
-import copy
-import re
 from typing import Union, Tuple, Callable, List
 
 from ..theme_manager import ThemeManager

customtkinter/windows/ctk_input_dialog.py

@@ -1,10 +1,7 @@
-import tkinter
-import time
 from typing import Union, Tuple
 
 from ..widgets.ctk_label import CTkLabel
 from ..widgets.ctk_entry import CTkEntry
-from ..widgets.ctk_frame import CTkFrame
 from ..windows.ctk_toplevel import CTkToplevel
 from ..widgets.ctk_button import CTkButton
 from ..appearance_mode_tracker import AppearanceModeTracker