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

fixed updating of bg_color with set_scaling in CTkBaseClass

Browse Source
This commit is contained in:
Tom Schimansky
2022-06-30 15:53:32 +02:00
parent 8bfd763786
commit c9653e7793
7 changed files with 212 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
customtkinter/widgets/ctk_optionmenu.py
View File

@ -90,7 +90,10 @@ class CTkOptionMenu(CTkBaseClass):
self.draw_engine = DrawEngine(self.canvas)
left_section_width = self._current_width - self._current_height
self.text_label = tkinter.Label(master=self, font=self.apply_font_scaling(self.text_font), anchor="w")
self.text_label = tkinter.Label(master=self,
font=self.apply_font_scaling(self.text_font),
anchor="w",
text=self.current_value)
self.text_label.grid(row=0, column=0, sticky="w",
padx=(max(self.apply_widget_scaling(self.corner_radius), self.apply_widget_scaling(3)),
max(self.apply_widget_scaling(self._current_width - left_section_width + 3), self.apply_widget_scaling(3))))

2
customtkinter/widgets/ctk_switch.py
View File

@ -44,7 +44,7 @@ class CTkSwitch(CTkBaseClass):
self.button_color = ThemeManager.theme["color"]["switch_button"] if button_color == "default_theme" else button_color
self.button_hover_color = ThemeManager.theme["color"]["switch_button_hover"] if button_hover_color == "default_theme" else button_hover_color
self.text_color = ThemeManager.theme["color"]["text"] if text_color == "default_theme" else text_color
self.text_color_disabled = ThemeManager.theme["color"]["text_button_disabled"] if text_color_disabled == "default_theme" else text_color_disabled
self.text_color_disabled = ThemeManager.theme["color"]["text_disabled"] if text_color_disabled == "default_theme" else text_color_disabled
# text
self.text = text

38
customtkinter/widgets/ctk_textbox.py
View File

@ -20,7 +20,7 @@ class CTkTextbox(CTkBaseClass):
**kwargs):
# transfer basic functionality (bg_color, size, _appearance_mode, scaling) to CTkBaseClass
super().__init__(*args, bg_color=bg_color, width=width, height=height, **kwargs)
super().__init__(*args, bg_color=bg_color, width=width, height=height)
# color
self.fg_color = ThemeManager.theme["color"]["entry"] if fg_color == "default_theme" else fg_color
@ -45,6 +45,8 @@ class CTkTextbox(CTkBaseClass):
self.canvas.configure(bg=ThemeManager.single_color(self.bg_color, self._appearance_mode))
self.draw_engine = DrawEngine(self.canvas)
for arg in ["highlightthickness", "fg", "bg"]:
kwargs.pop(arg, None)
self.textbox = tkinter.Text(self,
fg=ThemeManager.single_color(self.text_color, self._appearance_mode),
width=0,
@ -108,13 +110,21 @@ class CTkTextbox(CTkBaseClass):
self.canvas.tag_lower("inner_parts")
self.canvas.tag_lower("border_parts")
def yview(self, args, kwargs):
self.textbox.yview(args, kwargs)
def xview(self, args, kwargs):
self.textbox.xview(args, kwargs)
def insert(self, args, kwargs):
self.textbox.insert(args, kwargs)
def configure(self, *args, **kwargs):
require_redraw = False # some attribute changes require a call of self.draw() at the end
if "fg_color" in kwargs:
self.fg_color = kwargs["fg_color"]
self.fg_color = kwargs.pop("fg_color")
require_redraw = True
del kwargs["fg_color"]
# check if CTk widgets are children of the frame and change their bg_color to new frame fg_color
for child in self.winfo_children():
@ -122,36 +132,30 @@ class CTkTextbox(CTkBaseClass):
child.configure(bg_color=self.fg_color)
if "bg_color" in kwargs:
if kwargs["bg_color"] is None:
new_bg_color = kwargs.pop("bg_color")
if new_bg_color is None:
self.bg_color = self.detect_color_of_master()
else:
self.bg_color = kwargs["bg_color"]
self.bg_color = new_bg_color
require_redraw = True
del kwargs["bg_color"]
if "border_color" in kwargs:
self.border_color = kwargs["border_color"]
self.border_color = kwargs.pop("border_color")
require_redraw = True
del kwargs["border_color"]
if "corner_radius" in kwargs:
self.corner_radius = kwargs["corner_radius"]
self.corner_radius = kwargs.pop("corner_radius")
require_redraw = True
del kwargs["corner_radius"]
if "border_width" in kwargs:
self.border_width = kwargs["border_width"]
self.border_width = kwargs.pop("border_width")
require_redraw = True
del kwargs["border_width"]
if "width" in kwargs:
self.set_dimensions(width=kwargs["width"])
del kwargs["width"]
self.set_dimensions(width=kwargs.pop("width"))
if "height" in kwargs:
self.set_dimensions(height=kwargs["height"])
del kwargs["height"]
self.set_dimensions(height=kwargs.pop("height"))
self.textbox.configure(*args, **kwargs)

7
customtkinter/widgets/widget_base_class.py
View File

@ -151,7 +151,7 @@ class CTkBaseClass(tkinter.Frame):
if master_widget is None:
master_widget = self.master
if isinstance(master_widget, CTkBaseClass) and hasattr(master_widget, "fg_color"): # master is CTkFrame
if isinstance(master_widget, (CTkBaseClass, CTk, CTkToplevel)) and hasattr(master_widget, "fg_color"):
if master_widget.fg_color is not None:
return master_widget.fg_color
@ -178,11 +178,6 @@ class CTkBaseClass(tkinter.Frame):
elif mode_string.lower() == "light":
self._appearance_mode = 0
if isinstance(self.master, (CTkBaseClass, CTk)) and hasattr(self.master, "fg_color"):
self.bg_color = self.master.fg_color
else:
self.bg_color = self.master.cget("bg")
self.draw()
def set_scaling(self, new_widget_scaling, new_spacing_scaling, new_window_scaling):